Bump meson

.circleci/config.yml

@@ -33,7 +33,7 @@ jobs:
       - run: |
           /opt/python/cp311-cp311/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.15.0 meson[ninja]==1.4.0
           python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1
           python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
           python -m pip list --no-cache-dir

.github/workflows/unit-tests.yml

@@ -240,7 +240,7 @@ jobs:
         run: |
           /opt/python/cp311-cp311/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.15.0
           python -m pip install numpy --config-settings=setup-args="-Dallow-noblas=true"
           python -m pip install --no-cache-dir versioneer[toml] cython python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1
           python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
@@ -279,7 +279,7 @@ jobs:
         run: |
           /opt/python/cp311-cp311/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.15.0 meson[ninja]==1.4.0
           python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1
           python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
           python -m pip list --no-cache-dir
@@ -351,7 +351,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.15.0
           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 -m pip install python-dateutil pytz tzdata cython hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-cov

ci/deps/actions-310.yaml

@@ -7,8 +7,8 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
-  - meson-python=0.13.1
+  - meson[ninja]=1.4.0
+  - meson-python=0.15.0
 
   # test dependencies
   - pytest>=7.3.2

ci/deps/actions-311-downstream_compat.yaml

@@ -8,8 +8,8 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
-  - meson-python=0.13.1
+  - meson[ninja]=1.4.0
+  - meson-python=0.15.0
 
   # test dependencies
   - pytest>=7.3.2

ci/deps/actions-311-numpydev.yaml

@@ -6,8 +6,8 @@ dependencies:
 
   # build dependencies
   - versioneer[toml]
-  - meson[ninja]=1.2.1
-  - meson-python=0.13.1
+  - meson[ninja]=1.4.0
+  - meson-python=0.15.0
   - cython>=0.29.33
 
   # test dependencies

ci/deps/actions-311-pyarrownightly.yaml

@@ -6,9 +6,9 @@ dependencies:
 
   # build dependencies
   - versioneer[toml]
-  - meson[ninja]=1.2.1
+  - meson[ninja]=1.4.0
   - cython>=0.29.33
-  - meson-python=0.13.1
+  - meson-python=0.15.0
 
   # test dependencies
   - pytest>=7.3.2

ci/deps/actions-311-sanitizers.yaml

@@ -7,8 +7,8 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
-  - meson-python=0.13.1
+  - meson[ninja]=1.4.0
+  - meson-python=0.15.0
 
   # test dependencies
   - pytest>=7.3.2

ci/deps/actions-311.yaml

@@ -7,8 +7,8 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
-  - meson-python=0.13.1
+  - meson[ninja]=1.4.0
+  - meson-python=0.15.0
 
   # test dependencies
   - pytest>=7.3.2

ci/deps/actions-312.yaml

@@ -7,8 +7,8 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
-  - meson-python=0.13.1
+  - meson[ninja]=1.4.0
+  - meson-python=0.15.0
 
   # test dependencies
   - pytest>=7.3.2

ci/deps/actions-39-minimum_versions.yaml

@@ -9,8 +9,8 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
-  - meson-python=0.13.1
+  - meson[ninja]=1.4.0
+  - meson-python=0.15.0
 
   # test dependencies
   - pytest>=7.3.2

ci/deps/actions-39.yaml

@@ -7,8 +7,8 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
-  - meson-python=0.13.1
+  - meson[ninja]=1.4.0
+  - meson-python=0.15.0
 
   # test dependencies
   - pytest>=7.3.2

ci/deps/actions-pypy-39.yaml

@@ -10,8 +10,8 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
-  - meson-python=0.13.1
+  - meson[ninja]=1.4.0
+  - meson-python=0.15.0
 
   # test dependencies
   - pytest>=7.3.2

ci/deps/circle-310-arm64.yaml

@@ -7,8 +7,8 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
-  - meson-python=0.13.1
+  - meson[ninja]=1.4.0
+  - meson-python=0.15.0
 
   # test dependencies
   - pytest>=7.3.2

environment.yml

@@ -9,8 +9,8 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython~=3.0.5
-  - meson[ninja]=1.2.1
-  - meson-python=0.13.1
+  - meson[ninja]=1.4.0
+  - meson-python=0.15.0
 
   # test dependencies
   - pytest>=7.3.2

meson.build

@@ -4,7 +4,7 @@ project(
     'c', 'cpp', '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',

pandas/_libs/byteswap.pyx

@@ -15,7 +15,7 @@ from libc.string cimport memcpy
 
 def read_float_with_byteswap(bytes data, Py_ssize_t offset, bint byteswap):
     cdef uint32_t value
-    assert offset + sizeof(value) < len(data)
+    assert offset + sizeof(value) < <size_t>len(data)
     cdef const void *ptr = <unsigned char*>(data) + offset
     memcpy(&value, ptr, sizeof(value))
     if byteswap:
@@ -28,7 +28,7 @@ def read_float_with_byteswap(bytes data, Py_ssize_t offset, bint byteswap):
 
 def read_double_with_byteswap(bytes data, Py_ssize_t offset, bint byteswap):
     cdef uint64_t value
-    assert offset + sizeof(value) < len(data)
+    assert offset + sizeof(value) < <size_t>len(data)
     cdef const void *ptr = <unsigned char*>(data) + offset
     memcpy(&value, ptr, sizeof(value))
     if byteswap:
@@ -41,7 +41,7 @@ def read_double_with_byteswap(bytes data, Py_ssize_t offset, bint byteswap):
 
 def read_uint16_with_byteswap(bytes data, Py_ssize_t offset, bint byteswap):
     cdef uint16_t res
-    assert offset + sizeof(res) < len(data)
+    assert offset + sizeof(res) < <size_t>len(data)
     memcpy(&res, <const unsigned char*>(data) + offset, sizeof(res))
     if byteswap:
         res = _byteswap2(res)
@@ -50,7 +50,7 @@ def read_uint16_with_byteswap(bytes data, Py_ssize_t offset, bint byteswap):
 
 def read_uint32_with_byteswap(bytes data, Py_ssize_t offset, bint byteswap):
     cdef uint32_t res
-    assert offset + sizeof(res) < len(data)
+    assert offset + sizeof(res) < <size_t>len(data)
     memcpy(&res, <const unsigned char*>(data) + offset, sizeof(res))
     if byteswap:
         res = _byteswap4(res)
@@ -59,7 +59,7 @@ def read_uint32_with_byteswap(bytes data, Py_ssize_t offset, bint byteswap):
 
 def read_uint64_with_byteswap(bytes data, Py_ssize_t offset, bint byteswap):
     cdef uint64_t res
-    assert offset + sizeof(res) < len(data)
+    assert offset + sizeof(res) < <size_t>len(data)
     memcpy(&res, <const unsigned char*>(data) + offset, sizeof(res))
     if byteswap:
         res = _byteswap8(res)

pandas/_libs/include/pandas/vendored/klib/khash_python.h

@@ -33,11 +33,9 @@ static void *traced_calloc(size_t num, size_t size) {
 }
 
 static void *traced_realloc(void *old_ptr, size_t size) {
+  PyTraceMalloc_Untrack(KHASH_TRACE_DOMAIN, (uintptr_t)old_ptr);
   void *ptr = realloc(old_ptr, size);
   if (ptr != NULL) {
-    if (old_ptr != ptr) {
-      PyTraceMalloc_Untrack(KHASH_TRACE_DOMAIN, (uintptr_t)old_ptr);
-    }
     PyTraceMalloc_Track(KHASH_TRACE_DOMAIN, (uintptr_t)ptr, size);
   }
   return ptr;

pandas/_libs/meson.build

@@ -129,7 +129,7 @@ foreach ext_name, ext_dict : libs_sources
         ext_dict.get('sources'),
         cython_args: cython_args,
         include_directories: [inc_np, inc_pd],
-        dependencies: ext_dict.get('deps', ''),
+        dependencies: ext_dict.get('deps', []) + [np_dep],
         subdir: 'pandas/_libs',
         install: true
     )

pandas/_libs/tslibs/meson.build

@@ -34,7 +34,7 @@ foreach ext_name, ext_dict : tslibs_sources
         ext_dict.get('sources'),
         cython_args: cython_args,
         include_directories: [inc_np, inc_pd],
-        dependencies: ext_dict.get('deps', ''),
+        dependencies: ext_dict.get('deps', []) + [np_dep],
         subdir: 'pandas/_libs/tslibs',
         install: true
     )

pandas/_libs/window/meson.build

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

pandas/meson.build

@@ -1,7 +1,13 @@
-incdir_numpy = run_command(py,
-  [
-    '-c',
-    '''
+# NumPy 2.0 can be detected with meson >= 0.14.0
+np_dep = dependency('numpy', required : false)
+
+if np_dep.found()
+    inc_np = []
+else
+    incdir_numpy = run_command(py,
+      [
+        '-c',
+        '''
 import os
 import numpy as np
 try:
@@ -12,12 +18,14 @@ try:
 except Exception:
     incdir = np.get_include()
 print(incdir)
-     '''
-  ],
-  check: true
-).stdout().strip()
+         '''
+      ],
+      check: true
+    ).stdout().strip()
+
+    inc_np = include_directories(incdir_numpy)
+endif
 
-inc_np = include_directories(incdir_numpy)
 inc_pd = include_directories('_libs/include')
 
 fs.copyfile('__init__.py')

pyproject.toml

@@ -2,8 +2,8 @@
 # Minimum requirements for the build system to execute.
 # See https://github.com/scipy/scipy/pull/12940 for the AIX issue.
 requires = [
-    "meson-python==0.13.1",
-    "meson==1.2.1",
+    "meson-python==0.15.0",
+    "meson==1.4.0",
     "wheel",
     "Cython~=3.0.5",  # Note: sync with setup.py, environment.yml and asv.conf.json
     # Any NumPy version should be fine for compiling.  Users are unlikely

requirements-dev.txt

@@ -4,8 +4,8 @@
 pip
 versioneer[toml]
 cython~=3.0.5
-meson[ninja]==1.2.1
-meson-python==0.13.1
+meson[ninja]==1.4.0
+meson-python==0.15.0
 pytest>=7.3.2
 pytest-cov
 pytest-xdist>=2.2.0