Merge pull request #25748 from rgommers/unvendor-mesonpython

BLD: unvendor meson-python on 1.26.x and upgrade to meson-python 0.15

.github/workflows/wheels.yml

@@ -118,7 +118,7 @@ jobs:
           python-version: "3.x"
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@0b04ab1040366101259658b355777e4ff2d16f83  # v2.16.4
+        uses: pypa/cibuildwheel@ce3fb7832089eb3e723a0a99cab7f3eaccf074fd  # v2.16.5
         env:
           CIBW_PRERELEASE_PYTHONS: True
           CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}

.gitmodules

@@ -10,6 +10,3 @@
 [submodule "vendored-meson/meson"]
 	path = vendored-meson/meson
 	url = https://github.com/numpy/meson.git
-[submodule "vendored-meson/meson-python"]
-	path = vendored-meson/meson-python
-	url = https://github.com/numpy/meson-python.git

LICENSES_bundled.txt

@@ -30,11 +30,6 @@ Files: vendored-meson/meson/*
 License: Apache 2.0
   For license text, see vendored-meson/meson/COPYING
 
-Name: meson-python
-Files: vendored-meson/meson-python/*
-License: MIT
-  For license text, see vendored-meson/meson-python/LICENSE
-
 Name: spin
 Files: .spin/cmds.py
 License: BSD-3

numpy/core/code_generators/genapi.py

@@ -304,15 +304,6 @@ def find_functions(filename, tag='API'):
     fo.close()
     return functions
 
-def should_rebuild(targets, source_files):
-    from distutils.dep_util import newer_group
-    for t in targets:
-        if not os.path.exists(t):
-            return True
-    sources = API_FILES + list(source_files) + [__file__]
-    if newer_group(sources, targets[0], missing='newer'):
-        return True
-    return False
 
 def write_file(filename, data):
     """

numpy/core/code_generators/generate_numpy_api.py

@@ -148,12 +148,7 @@ def generate_api(output_dir, force=False):
     targets = (h_file, c_file)
 
     sources = numpy_api.multiarray_api
-
-    if (not force and not genapi.should_rebuild(targets, [numpy_api.__file__, __file__])):
-        return targets
-    else:
-        do_generate_api(targets, sources)
-
+    do_generate_api(targets, sources)
     return targets
 
 def do_generate_api(targets, sources):

numpy/core/code_generators/generate_ufunc_api.py

@@ -125,12 +125,7 @@ def generate_api(output_dir, force=False):
     targets = (h_file, c_file)
 
     sources = ['ufunc_api_order.txt']
-
-    if (not force and not genapi.should_rebuild(targets, sources + [__file__])):
-        return targets
-    else:
-        do_generate_api(targets, sources)
-
+    do_generate_api(targets, sources)
     return targets
 
 def do_generate_api(targets, sources):

pyproject.toml

@@ -1,18 +1,8 @@
 [build-system]
 build-backend = "mesonpy"
-backend-path = ['./vendored-meson/meson-python']
 requires = [
     "Cython>=0.29.34,<3.1",
-    # All dependencies of the vendored meson-python (except for meson, because
-    # we've got that vendored too - that's the point of this exercise).
-    'pyproject-metadata >= 0.7.1',
-    'tomli >= 1.0.0; python_version < "3.11"',
-    'setuptools >= 60.0; python_version >= "3.12"',
-    'colorama; os_name == "nt"',
-    # Note that `ninja` and (on Linux) `patchelf` are added dynamically by
-    # meson-python if those tools are not already present on the system. No
-    # need to worry about those unless one does a non-isolated build - in that
-    # case they must already be installed on the system.
+    "meson-python>=0.15.0,<0.16.0",
 ]
 
 [project]
@@ -191,6 +181,9 @@ environment = {PKG_CONFIG_PATH="/opt/32/lib/pkgconfig"}
 config-settings = "setup-args=--vsenv setup-args=-Dallow-noblas=true"
 repair-wheel-command = ""
 
+[tool.meson-python]
+meson = 'vendored-meson/meson/meson.py'
+
 [tool.spin]
 package = 'numpy'