BLD: use meson's NumPy resolution mechanism for building

Instead of querying the include folder's location from NumPy during
building, use Meson's built-in dependency resolution for NumPy.

With this change during build-time Meson first tries to query the
dependency details using numpy-config (which, in turn essentially
uses the same method as the original code this commit replaces),
and in case that fails for some reason, it tries to discover
NumPy resources using pkg-config - which, beside being a good
fail-over mechanism, has the added benefit of somewhat simpler
cross-compiling, as querying the include folder location from
NumPy module is only usable for cross-compiling only in some
corner cases, while pkg-config is a bit more universal.

Signed-off-by: Gyorgy Sarvari <[email protected]>

Author: OldManYellsAtCloud

.github/workflows/unit-tests.yml

@@ -244,7 +244,7 @@ jobs:
         run: |
           /opt/python/cp313-cp313/bin/python -m venv ~/virtualenvs/pandas-dev
           . ~/virtualenvs/pandas-dev/bin/activate
-          python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.2.1 meson-python==0.13.1
+          python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.4.0 meson-python==0.13.1
           python -m pip install numpy -Csetup-args="-Dallow-noblas=true"
           python -m pip install --no-cache-dir versioneer[toml] cython python-dateutil pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
           python -m pip install --no-cache-dir --no-build-isolation -e . -Csetup-args="--werror"
@@ -282,7 +282,7 @@ jobs:
         run: |
           /opt/python/cp313-cp313/bin/python -m venv ~/virtualenvs/pandas-dev
           . ~/virtualenvs/pandas-dev/bin/activate
-          python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
+          python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.4.0
           python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
           python -m pip install --no-cache-dir --no-build-isolation -e . -Csetup-args="--werror"
           python -m pip list --no-cache-dir
@@ -353,7 +353,7 @@ jobs:
       - name: Build Environment
         run: |
           python --version
-          python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1
+          python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.4.0 meson-python==0.13.1
           python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
           python -m pip install versioneer[toml] python-dateutil tzdata cython hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov
           python -m pip install -ve . --no-build-isolation --no-index --no-deps -Csetup-args="--werror"
@@ -395,7 +395,7 @@ jobs:
       - name: Build Environment
         run: |
           python --version
-          python -m pip install --upgrade pip setuptools wheel numpy meson[ninja]==1.2.1 meson-python==0.13.1
+          python -m pip install --upgrade pip setuptools wheel numpy meson[ninja]==1.4.0 meson-python==0.13.1
           python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple cython
           python -m pip install versioneer[toml] python-dateutil pytz tzdata hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov
           python -m pip install -ve . --no-build-isolation --no-index --no-deps -Csetup-args="--werror"

ci/deps/actions-310-minimum_versions.yaml

@@ -9,7 +9,7 @@ dependencies:
   # build dependencies
   - versioneer
   - cython>=0.29.33
-  - meson=1.2.1
+  - meson=1.4.0
   - meson-python=0.13.1
 
   # test dependencies

ci/deps/actions-310.yaml

@@ -7,7 +7,7 @@ dependencies:
   # build dependencies
   - versioneer
   - cython>=0.29.33
-  - meson=1.2.1
+  - meson=1.4.0
   - meson-python=0.13.1
 
   # test dependencies

ci/deps/actions-311-downstream_compat.yaml

@@ -8,7 +8,7 @@ dependencies:
   # build dependencies
   - versioneer
   - cython>=0.29.33
-  - meson=1.2.1
+  - meson=1.4.0
   - meson-python=0.13.1
 
   # test dependencies

ci/deps/actions-311-numpydev.yaml

@@ -6,7 +6,7 @@ dependencies:
 
   # build dependencies
   - versioneer
-  - meson=1.2.1
+  - meson=1.4.0
   - meson-python=0.13.1
   - cython>=0.29.33
 

ci/deps/actions-311-pyarrownightly.yaml

@@ -6,7 +6,7 @@ dependencies:
 
   # build dependencies
   - versioneer
-  - meson=1.2.1
+  - meson=1.4.0
   - cython>=0.29.33
   - meson-python=0.13.1
 

ci/deps/actions-311.yaml

@@ -7,7 +7,7 @@ dependencies:
   # build dependencies
   - versioneer
   - cython>=0.29.33
-  - meson=1.2.1
+  - meson=1.4.0
   - meson-python=0.13.1
 
   # test dependencies

ci/deps/actions-312.yaml

@@ -7,7 +7,7 @@ dependencies:
   # build dependencies
   - versioneer
   - cython>=0.29.33
-  - meson=1.2.1
+  - meson=1.4.0
   - meson-python=0.13.1
 
   # test dependencies

ci/deps/actions-pypy-39.yaml

@@ -10,7 +10,7 @@ dependencies:
   # build dependencies
   - versioneer
   - cython>=0.29.33
-  - meson=1.2.1
+  - meson=1.4.0
   - meson-python=0.13.1
 
   # test dependencies

doc/source/whatsnew/v3.0.0.rst

@@ -81,6 +81,7 @@ Other enhancements
 - Support passing a :class:`Iterable[Hashable]` input to :meth:`DataFrame.drop_duplicates` (:issue:`59237`)
 - Support reading Stata 102-format (Stata 1) dta files (:issue:`58978`)
 - Support reading Stata 110-format (Stata 7) dta files (:issue:`47176`)
+- Use Meson's native NumPy dependency resolution method for building (:issue:`61095`)
 
 .. ---------------------------------------------------------------------------
 .. _whatsnew_300.notable_bug_fixes:

environment.yml

@@ -9,7 +9,7 @@ dependencies:
   # build dependencies
   - versioneer
   - cython~=3.0.5
-  - meson=1.2.1
+  - meson=1.4.0
   - meson-python=0.13.1
 
   # test dependencies

meson.build

@@ -6,15 +6,15 @@ project(
     'cython',
     version: run_command(['generate_version.py', '--print'], check: true).stdout().strip(),
     license: 'BSD-3',
-    meson_version: '>=1.2.1',
+    meson_version: '>=1.4.0',
     default_options: ['buildtype=release', 'c_std=c11', 'warning_level=2'],
 )
 
 fs = import('fs')
 py = import('python').find_installation(pure: false)
 tempita = files('generate_pxi.py')
 versioneer = files('generate_version.py')
-
+numpy_dep = dependency('numpy', method: 'auto')
 
 add_project_arguments('-DNPY_NO_DEPRECATED_API=0', language: 'c')
 add_project_arguments('-DNPY_NO_DEPRECATED_API=0', language: 'cpp')

pandas/_libs/meson.build

@@ -149,12 +149,17 @@ if get_option('buildtype') == 'debug'
 endif
 
 foreach ext_name, ext_dict : libs_sources
+    dependencies = [numpy_dep]
+    if ext_dict.has_key('deps')
+        dependencies += ext_dict.get('deps')
+    endif
+
     py.extension_module(
         ext_name,
         ext_dict.get('sources'),
         cython_args: cython_args,
-        include_directories: [inc_np, inc_pd],
-        dependencies: ext_dict.get('deps', ''),
+        include_directories: [inc_pd],
+        dependencies: dependencies,
         subdir: 'pandas/_libs',
         install: true,
     )

pandas/_libs/tslibs/meson.build

@@ -29,12 +29,17 @@ if get_option('buildtype') == 'debug'
 endif
 
 foreach ext_name, ext_dict : tslibs_sources
+    dependencies = [numpy_dep]
+    if ext_dict.has_key('deps')
+        dependencies += ext_dict.get('deps')
+    endif
+
     py.extension_module(
         ext_name,
         ext_dict.get('sources'),
         cython_args: cython_args,
-        include_directories: [inc_np, inc_pd],
-        dependencies: ext_dict.get('deps', ''),
+        include_directories: [inc_pd],
+        dependencies: dependencies,
         subdir: 'pandas/_libs/tslibs',
         install: true,
     )

pandas/_libs/window/meson.build

@@ -2,7 +2,8 @@ py.extension_module(
     'aggregations',
     ['aggregations.pyx'],
     cython_args: ['-X always_allow_keywords=true'],
-    include_directories: [inc_np, inc_pd],
+    include_directories: [inc_pd],
+    dependencies: [numpy_dep],
     subdir: 'pandas/_libs/window',
     override_options: ['cython_language=cpp'],
     install: true,
@@ -12,7 +13,8 @@ py.extension_module(
     'indexers',
     ['indexers.pyx'],
     cython_args: ['-X always_allow_keywords=true'],
-    include_directories: [inc_np, inc_pd],
+    include_directories: [inc_pd],
+    dependencies: [numpy_dep],
     subdir: 'pandas/_libs/window',
     install: true,
 )

pandas/meson.build

@@ -1,24 +1,3 @@
-incdir_numpy = run_command(
-    py,
-    [
-        '-c',
-        '''
-import os
-import numpy as np
-try:
-    # Check if include directory is inside the pandas dir
-    # e.g. a venv created inside the pandas dir
-    # If so, convert it to a relative path
-    incdir = os.path.relpath(np.get_include())
-except Exception:
-    incdir = np.get_include()
-print(incdir)
-     ''',
-    ],
-    check: true,
-).stdout().strip()
-
-inc_np = include_directories(incdir_numpy)
 inc_pd = include_directories('_libs/include')
 
 fs.copyfile('__init__.py')

pyproject.toml

@@ -3,7 +3,7 @@
 # See https://github.com/scipy/scipy/pull/12940 for the AIX issue.
 requires = [
     "meson-python>=0.13.1",
-    "meson>=1.2.1,<2",
+    "meson>=1.4.0,<2",
     "wheel",
     "Cython~=3.0.5",  # Note: sync with setup.py, environment.yml and asv.conf.json
     # Force numpy higher than 2.0rc1, so that built wheels are compatible