From 06481f0aa3b498aeefe3b47a578a7e1fdad70972 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 8 Jan 2025 13:51:11 -0500 Subject: [PATCH] Relax meson pins in CI --- .circleci/config.yml | 2 +- ci/deps/actions-310.yaml | 4 ++-- ci/deps/actions-311-downstream_compat.yaml | 4 ++-- ci/deps/actions-311-numpydev.yaml | 4 ++-- ci/deps/actions-311-pyarrownightly.yaml | 4 ++-- ci/deps/actions-311.yaml | 4 ++-- ci/deps/actions-312.yaml | 4 ++-- ci/deps/actions-pypy-39.yaml | 4 ++-- ci/deps/circle-311-arm64.yaml | 4 ++-- environment.yml | 4 ++-- pyproject.toml | 2 +- requirements-dev.txt | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 139ea9d220453..fe4b89788c822 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,7 +54,7 @@ jobs: command: | /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 meson[ninja] 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 diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 74cab4e0970dc..4b6f22d39ce8a 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -7,8 +7,8 @@ dependencies: # build dependencies - versioneer - cython>=0.29.33 - - meson=1.2.1 - - meson-python=0.13.1 + - meson>=1.2.1 + - meson-python>=0.13.1 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index 092ca18d61259..3d22047f4f15a 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -8,8 +8,8 @@ dependencies: # build dependencies - versioneer - cython>=0.29.33 - - meson=1.2.1 - - meson-python=0.13.1 + - meson>=1.2.1 + - meson-python>=0.13.1 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/actions-311-numpydev.yaml b/ci/deps/actions-311-numpydev.yaml index 325a6d45d74fd..653aa78ece3ee 100644 --- a/ci/deps/actions-311-numpydev.yaml +++ b/ci/deps/actions-311-numpydev.yaml @@ -6,8 +6,8 @@ dependencies: # build dependencies - versioneer - - meson=1.2.1 - - meson-python=0.13.1 + - meson>=1.2.1 + - meson-python>=0.13.1 - cython>=0.29.33 # test dependencies diff --git a/ci/deps/actions-311-pyarrownightly.yaml b/ci/deps/actions-311-pyarrownightly.yaml index 22e4907e5a6e5..caea416e6a85d 100644 --- a/ci/deps/actions-311-pyarrownightly.yaml +++ b/ci/deps/actions-311-pyarrownightly.yaml @@ -6,9 +6,9 @@ dependencies: # build dependencies - versioneer - - meson=1.2.1 + - meson>=1.2.1 - cython>=0.29.33 - - meson-python=0.13.1 + - meson-python>=0.13.1 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index b6f515dceaea9..78b13edd47d6d 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -7,8 +7,8 @@ dependencies: # build dependencies - versioneer - cython>=0.29.33 - - meson=1.2.1 - - meson-python=0.13.1 + - meson>=1.2.1 + - meson-python>=0.13.1 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml index bc66f8a5382c9..289184e8dac5b 100644 --- a/ci/deps/actions-312.yaml +++ b/ci/deps/actions-312.yaml @@ -7,8 +7,8 @@ dependencies: # build dependencies - versioneer - cython>=0.29.33 - - meson=1.2.1 - - meson-python=0.13.1 + - meson>=1.2.1 + - meson-python>=0.13.1 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/actions-pypy-39.yaml b/ci/deps/actions-pypy-39.yaml index 90933b24b88db..d46b98c77fd87 100644 --- a/ci/deps/actions-pypy-39.yaml +++ b/ci/deps/actions-pypy-39.yaml @@ -10,8 +10,8 @@ dependencies: # build dependencies - versioneer - cython>=0.29.33 - - meson=1.2.1 - - meson-python=0.13.1 + - meson>=1.2.1 + - meson-python>=0.13.1 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/circle-311-arm64.yaml b/ci/deps/circle-311-arm64.yaml index 3f09e27d0fe4b..1ebdc36b51865 100644 --- a/ci/deps/circle-311-arm64.yaml +++ b/ci/deps/circle-311-arm64.yaml @@ -7,8 +7,8 @@ dependencies: # build dependencies - versioneer - cython>=0.29.33 - - meson=1.2.1 - - meson-python=0.13.1 + - meson>=1.2.1 + - meson-python>=0.13.1 # test dependencies - pytest>=7.3.2 diff --git a/environment.yml b/environment.yml index 69647a436e3ad..9ba33052fb256 100644 --- a/environment.yml +++ b/environment.yml @@ -9,8 +9,8 @@ dependencies: # build dependencies - versioneer - cython~=3.0.5 - - meson=1.2.1 - - meson-python=0.13.1 + - meson>=1.2.1 + - meson-python>=0.13.1 # test dependencies - pytest>=7.3.2 diff --git a/pyproject.toml b/pyproject.toml index 7ab9cd2c17669..e6f50f1e81037 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.13.1", - "meson>=1.2.1,<2", + "meson>=1.2.1", "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 diff --git a/requirements-dev.txt b/requirements-dev.txt index fb4d9cdb589ca..e6c9f631a6683 100644 --- a/requirements-dev.txt +++ b/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.2.1 +meson-python>=0.13.1 pytest>=7.3.2 pytest-cov pytest-xdist>=3.4.0