From 639dc694b61c50e9e72b5548c3d61cf31ed26fd0 Mon Sep 17 00:00:00 2001 From: Alvaro-Kothe Date: Tue, 19 May 2026 19:47:05 -0300 Subject: [PATCH 1/2] chore: bump meson to 1.3.0 Bump meson for `has_define` compiler method. --- .github/workflows/unit-tests.yml | 6 +++--- ci/deps/actions-311-minimum_versions.yaml | 2 +- environment.yml | 2 +- meson.build | 2 +- pixi.toml | 2 +- pyproject.toml | 2 +- requirements-dev.txt | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 73018750f156d..4b9c712525618 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -288,7 +288,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 meson[ninja]==1.2.3 meson-python==0.18.0 + python -m pip install --no-cache-dir -U pip wheel meson[ninja]==1.3.0 meson-python==0.18.0 python -m pip install numpy -Csetup-args="-Dallow-noblas=true" python -m pip install --no-cache-dir versioneer[toml] cython python-dateutil pytest>=8.3.4 pytest-xdist>=3.6.1 hypothesis>=6.116.0 pytest-cov python -m pip install --no-cache-dir --no-build-isolation -e . -Csetup-args="--werror" @@ -332,7 +332,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 meson-python==0.18.0 meson[ninja]==1.2.3 + python -m pip install --no-cache-dir -U pip wheel meson-python==0.18.0 meson[ninja]==1.3.0 python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytest>=8.3.4 pytest-xdist>=3.6.1 hypothesis>=6.116.0 pytest-cov python -m pip install --no-cache-dir --no-build-isolation -e . -Csetup-args="--werror" python -m pip list --no-cache-dir @@ -426,7 +426,7 @@ jobs: - name: Build Environment run: | python --version - python -m pip install --upgrade pip wheel meson[ninja]==1.2.3 meson-python==0.18.0 + python -m pip install --upgrade pip wheel meson[ninja]==1.3.0 meson-python==0.18.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-dateutil tzdata cython hypothesis>=6.116.0 pytest>=8.3.4 pytest-xdist>=3.6.1 pytest-cov python -m pip install -ve . --no-build-isolation --no-index --no-deps -Csetup-args="--werror" diff --git a/ci/deps/actions-311-minimum_versions.yaml b/ci/deps/actions-311-minimum_versions.yaml index 799f8e6950afa..5c7638f49d91e 100644 --- a/ci/deps/actions-311-minimum_versions.yaml +++ b/ci/deps/actions-311-minimum_versions.yaml @@ -9,7 +9,7 @@ dependencies: # build dependencies - versioneer - cython<4.0.0a0 - - meson=1.2.3 + - meson=1.3.0 - meson-python=0.18.0 # test dependencies diff --git a/environment.yml b/environment.yml index dd42166d3c97d..6b80e78ae9480 100644 --- a/environment.yml +++ b/environment.yml @@ -9,7 +9,7 @@ dependencies: # build dependencies - versioneer - cython>=3.1.0,<4.0.0a0 - - meson>=1.2.3,<2 + - meson>=1.3.0,<2 - meson-python>=0.18.0,<1 # test dependencies diff --git a/meson.build b/meson.build index d2874e85cc3a7..9102201bb524e 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project( 'cython', version: run_command(['generate_version.py', '--print'], check: true).stdout().strip(), license: 'BSD-3', - meson_version: '>=1.2.3', + meson_version: '>=1.3.0', default_options: [ 'buildtype=release', 'c_std=c17', diff --git a/pixi.toml b/pixi.toml index e826136f8bf3d..9a465ecb15f73 100644 --- a/pixi.toml +++ b/pixi.toml @@ -9,7 +9,7 @@ name = "pandas" # Build dependencies versioneer = ">=0.29" cython = ">3.1.0,<4.0.0a0" -meson = ">=1.2.3,<2" +meson = ">=1.3.0,<2" meson-python = ">=0.19.0,<1" c-compiler = "*" cxx-compiler = "*" diff --git a/pyproject.toml b/pyproject.toml index 72081de77b884..4b9e5c6dad811 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ # See https://github.com/scipy/scipy/pull/12940 for the AIX issue. requires = [ "meson-python>=0.19.0,<1", - "meson>=1.2.3,<2", + "meson>=1.3.0,<2", "wheel", "Cython>3.1.0,<4.0.0a0", # Note: sync with environment.yml and asv.conf.json # Force numpy higher than 2.0, so that built wheels are compatible diff --git a/requirements-dev.txt b/requirements-dev.txt index d2cbc1cc9120e..b8b02f49dcce9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,7 +4,7 @@ pip versioneer[toml] cython>=3.1.0,<4.0.0a0 -meson[ninja]>=1.2.3,<2 +meson[ninja]>=1.3.0,<2 meson-python>=0.18.0,<1 pytest>=8.3.4 pytest-cov From 0ae30ea975f5e2ebd5f3b89946e6fd625a1fa143 Mon Sep 17 00:00:00 2001 From: Alvaro-Kothe Date: Tue, 19 May 2026 20:36:20 -0300 Subject: [PATCH 2/2] fix: update lock file --- pixi.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/pixi.lock b/pixi.lock index f42e26b5d0b2e..374cdb840d1dd 100644 --- a/pixi.lock +++ b/pixi.lock @@ -7029,7 +7029,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/matplotlib-3.9.3-py311h38be061_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.9.3-py311h2b939e6_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.2-pyhd8ed1ab_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/meson-1.2.3-pyhd8ed1ab_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/meson-1.3.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/meson-python-0.19.0-pyh7e86bf3_2.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/mmh3-4.1.0-py311hb755f60_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mmhash3-3.0.1-py313h94de1ce_3.conda @@ -7392,7 +7392,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/matplotlib-3.9.3-py311hfecb2dc_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/matplotlib-base-3.9.3-py311h0385ec1_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.2-pyhd8ed1ab_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/meson-1.2.3-pyhd8ed1ab_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/meson-1.3.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/meson-python-0.19.0-pyh7e86bf3_2.conda - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/mmh3-4.1.0-py311h8715677_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mmhash3-3.0.1-py313h94de1ce_3.conda @@ -7733,7 +7733,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-64/matplotlib-3.9.3-py311h6eed73b_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/matplotlib-base-3.9.3-py311h19a4563_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.2-pyhd8ed1ab_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/meson-1.2.3-pyhd8ed1ab_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/meson-1.3.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/meson-python-0.19.0-pyh7e86bf3_2.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/mmh3-4.1.0-py311hdd0406b_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mmhash3-3.0.1-py313h94de1ce_3.conda @@ -8036,7 +8036,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/matplotlib-3.9.3-py311ha1ab1f8_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/matplotlib-base-3.9.3-py311h031da69_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.2-pyhd8ed1ab_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/meson-1.2.3-pyhd8ed1ab_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/meson-1.3.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/meson-python-0.19.0-pyh7e86bf3_2.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/mmh3-4.1.0-py311h92babd0_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mmhash3-3.0.1-py313h94de1ce_3.conda @@ -8319,7 +8319,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/win-64/matplotlib-3.9.3-py311h1ea47a8_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/matplotlib-base-3.9.3-py311h8f1b1e4_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.2-pyhd8ed1ab_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/meson-1.2.3-pyhd8ed1ab_0.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/meson-1.3.0-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/meson-python-0.19.0-pyh7e86bf3_2.conda - conda: https://conda.anaconda.org/conda-forge/win-64/mmh3-4.1.0-py311h12c1d0e_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/mmhash3-3.0.1-py313h94de1ce_3.conda @@ -17868,7 +17868,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2025c-hc9c84f9_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/versioneer-0.29-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.7-hb78ec9c_6.conda - - pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev48/pyarrow-25.0.0.dev48-cp313-cp313-manylinux_2_28_x86_64.whl + - pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev60/pyarrow-25.0.0.dev60-cp313-cp313-manylinux_2_28_x86_64.whl linux-aarch64: - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/_openmp_mutex-4.5-20_gnu.conda - conda: https://conda.anaconda.org/conda-forge/noarch/attrs-26.1.0-pyhcf101f3_0.conda @@ -17943,7 +17943,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2025c-hc9c84f9_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/versioneer-0.29-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/zstd-1.5.7-h85ac4a6_6.conda - - pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev48/pyarrow-25.0.0.dev48-cp313-cp313-manylinux_2_28_aarch64.whl + - pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev60/pyarrow-25.0.0.dev60-cp313-cp313-manylinux_2_28_aarch64.whl osx-64: - conda: https://conda.anaconda.org/conda-forge/osx-64/_openmp_mutex-4.5-7_kmp_llvm.conda - conda: https://conda.anaconda.org/conda-forge/noarch/attrs-26.1.0-pyhcf101f3_0.conda @@ -18029,7 +18029,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2025c-hc9c84f9_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/versioneer-0.29-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.7-h3eecb57_6.conda - - pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev48/pyarrow-25.0.0.dev48-cp313-cp313-macosx_12_0_x86_64.whl + - pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev60/pyarrow-25.0.0.dev60-cp313-cp313-macosx_12_0_x86_64.whl osx-arm64: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/_openmp_mutex-4.5-7_kmp_llvm.conda - conda: https://conda.anaconda.org/conda-forge/noarch/attrs-26.1.0-pyhcf101f3_0.conda @@ -18114,7 +18114,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/tzdata-2025c-hc9c84f9_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/versioneer-0.29-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.7-hbf9d68e_6.conda - - pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev48/pyarrow-25.0.0.dev48-cp313-cp313-macosx_12_0_arm64.whl + - pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev60/pyarrow-25.0.0.dev60-cp313-cp313-macosx_12_0_arm64.whl win-64: - conda: https://conda.anaconda.org/conda-forge/noarch/attrs-26.1.0-pyhcf101f3_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/bzip2-1.0.8-h0ad9c76_9.conda @@ -18177,7 +18177,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/versioneer-0.29-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/win-64/vs2022_win-64-19.44.35207-ha74f236_34.conda - conda: https://conda.anaconda.org/conda-forge/noarch/vswhere-3.1.7-h40126e0_1.conda - - pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev48/pyarrow-25.0.0.dev48-cp313-cp313-win_amd64.whl + - pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev60/pyarrow-25.0.0.dev60-cp313-cp313-win_amd64.whl typing: channels: - url: https://conda.anaconda.org/conda-forge/ @@ -46149,17 +46149,17 @@ packages: - pkg:pypi/meson?source=hash-mapping size: 776653 timestamp: 1776755211908 -- conda: https://conda.anaconda.org/conda-forge/noarch/meson-1.2.3-pyhd8ed1ab_0.conda - sha256: 8781b90ae65e1e982a7a28850567630d3f5b6b9c4a88cd9aa3f8a7a4971991e2 - md5: 884e718cb42b3dbdf07f0ebea32ccacd +- conda: https://conda.anaconda.org/conda-forge/noarch/meson-1.3.0-pyhd8ed1ab_0.conda + sha256: d9fe5a31b301c662a7410d477257932a76149430acaf760131a35a1476956e96 + md5: 48fa9fd8e4226d71cdbef619f2402572 depends: - ninja >=1.8.2 - python >=3.5.2 - setuptools license: Apache-2.0 license_family: APACHE - size: 618539 - timestamp: 1697868378316 + size: 628242 + timestamp: 1700451735019 - conda: https://conda.anaconda.org/conda-forge/noarch/meson-python-0.19.0-pyh7e86bf3_2.conda sha256: f608b7ee5ef089c31a80ea3b5dd42765f6792438a5c23efaad8419ad4e47b96d md5: 369afcc2d4965e7a6a075ab82e2a26b8 @@ -53676,25 +53676,25 @@ packages: license_family: BSD size: 12459191 timestamp: 1774003569528 -- pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev48/pyarrow-25.0.0.dev48-cp313-cp313-macosx_12_0_arm64.whl +- pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev60/pyarrow-25.0.0.dev60-cp313-cp313-macosx_12_0_arm64.whl name: pyarrow - version: 25.0.0.dev48 + version: 25.0.0.dev60 requires_python: '>=3.10' -- pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev48/pyarrow-25.0.0.dev48-cp313-cp313-macosx_12_0_x86_64.whl +- pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev60/pyarrow-25.0.0.dev60-cp313-cp313-macosx_12_0_x86_64.whl name: pyarrow - version: 25.0.0.dev48 + version: 25.0.0.dev60 requires_python: '>=3.10' -- pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev48/pyarrow-25.0.0.dev48-cp313-cp313-manylinux_2_28_aarch64.whl +- pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev60/pyarrow-25.0.0.dev60-cp313-cp313-manylinux_2_28_aarch64.whl name: pyarrow - version: 25.0.0.dev48 + version: 25.0.0.dev60 requires_python: '>=3.10' -- pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev48/pyarrow-25.0.0.dev48-cp313-cp313-manylinux_2_28_x86_64.whl +- pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev60/pyarrow-25.0.0.dev60-cp313-cp313-manylinux_2_28_x86_64.whl name: pyarrow - version: 25.0.0.dev48 + version: 25.0.0.dev60 requires_python: '>=3.10' -- pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev48/pyarrow-25.0.0.dev48-cp313-cp313-win_amd64.whl +- pypi: https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/pyarrow/25.0.0.dev60/pyarrow-25.0.0.dev60-cp313-cp313-win_amd64.whl name: pyarrow - version: 25.0.0.dev48 + version: 25.0.0.dev60 requires_python: '>=3.10' - conda: https://conda.anaconda.org/conda-forge/linux-64/pyarrow-13.0.0-py311h02bbc4d_49_cpu.conda build_number: 49