8000 BLD: only install the `f2py` command, not `f2py3` or `f2py3.X` by rgommers · Pull Request #24235 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BLD: only install the f2py command, not f2py3 or f2py3.X #24235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 22, 2023
Merged

BLD: only install the f2py command, not f2py3 or f2py3.X #24235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52410a7
BLD: fix a build warning for missing check in `run_command`
rgommers Jul 22, 2023
cab23e5
BLD: add comment on where platforms to build wheels for are controlled
rgommers Jul 22, 2023
55b7c3d
BLD: only install the `f2py` command, not `f2py3` or `f2py3.X`
rgommers Jul 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions doc/source/f2py/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ available in your system, you may have to run it as a module::

python -m numpy.f2py

Using the ``python -m`` invocation is also good practice if you have multiple
Python installs with NumPy in your system (outside of virtual environments) and
you want to ensure you pick up a particular version of Python/F2PY.

If you run ``f2py`` with no arguments, and the line ``numpy Version`` at the
end matches the NumPy version printed from ``python -m numpy.f2py``, then you
can use the shorter version. If not, or if you cannot run ``f2py``, you should
Expand Down
5 changes: 4 additions & 1 deletion numpy/core/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ C_API_VERSION = '0x00000012'

# Check whether we have a mismatch between the set C API VERSION and the
# actual C API VERSION. Will raise a MismatchCAPIError if so.
r = run_command('code_generators/verify_c_api_version.py', '--api-version', C_API_VERSION)
r = run_command(
'code_generators/verify_c_api_version.py', '--api-version', C_API_VERSION,
check: true
)

if r.returncode() != 0
error('verify_c_api_version.py failed with output:\n' + r.stderr().strip())
Expand Down
7 changes: 2 additions & 5 deletions numpy/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# We need -lm for all C code (assuming it uses math functions, which is safe to
# assume for numpy).
# assume for NumPy). For C++ it isn't needed, because libstdc++/libc++ is
# guaranteed to depend on it.
m_dep = cc.find_library('m', required : false)
mlib_linkflag = ''
if m_dep.found()
Expand Down Expand Up @@ -204,10 +205,6 @@ src_file = generator(src_file_cli,
)

tempita_cli = find_program('_build_utils/tempita.py')
tempita = generator(tempita_cli,
arguments : ['@INPUT@', '--outfile', '@OUTPUT@'],
output : '@BASENAME@'
)

pure_subdirs = [
'_pyinstaller',
Expand Down
9 changes: 3 additions & 6 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,9 @@ classifiers = [
'Operating System :: Unix',
'Operating System :: MacOS',
]
#dynamic = ["scripts"]

[project.scripts]
# TODO: this is currently dynamic for minor version support. See also the same
# thing in setup.py. Can we get rid of that? see commit f22a33b71 for rationale
# for dynamic behavior.
f2py = 'numpy.f2py.f2py2e:main'
f2py3 = 'numpy.f2py.f2py2e:main'
#f2py3.MINOR_VERSION = 'numpy.f2py.f2py2e:main'

[project.entry-points.array_api]
numpy = 'numpy.array_api'
Expand Down Expand Up @@ -142,6 +136,9 @@ tracker = "https://github.com/numpy/numpy/issues"


[tool.cibuildwheel]
# Note: the below skip command doesn't do much currently, the platforms to
# build wheels for in CI are controlled in `.github/workflows/wheels.yml` and
# `tools/ci/cirrus_wheels.yml`.
skip = "cp36-* cp37-* cp-38* pp37-* *-manylinux_i686 *_ppc64le *_s390x *-musllinux_aarch64 *-win32"
build-verbosity = "3"
before-build = "bash {project}/tools/wheels/cibw_before_build.sh {project}"
Expand Down
0