From 121115e7054cbf7829c6560e9ecbf65c18f20392 Mon Sep 17 00:00:00 2001 From: Richard Shadrach Date: Tue, 20 May 2025 17:06:41 -0400 Subject: [PATCH 1/4] BUILD: Bump Cython to 3.1 --- asv_bench/asv.conf.json | 2 +- environment.yml | 2 +- requirements-dev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json index 30c692115eab1..d286e57ce6b51 100644 --- a/asv_bench/asv.conf.json +++ b/asv_bench/asv.conf.json @@ -42,7 +42,7 @@ // followed by the pip installed packages). "matrix": { "pip+build": [], - "Cython": ["3.0"], + "Cython": [], "matplotlib": [], "sqlalchemy": [], "scipy": [], diff --git a/environment.yml b/environment.yml index 6300e32b5a1b5..61b0d11ecd7eb 100644 --- a/environment.yml +++ b/environment.yml @@ -8,7 +8,7 @@ dependencies: # build dependencies - versioneer - - cython~=3.0.5 + - cython~=3.1.0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/requirements-dev.txt b/requirements-dev.txt index c2bac550bc664..682d18f2f7c1b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ pip versioneer[toml] -cython~=3.0.5 +cython~=3.1.0 meson[ninja]==1.2.1 meson-python==0.13.1 pytest>=7.3.2 From c02cd6ffdc2f29e3ed0b68a7f34eda5273dde195 Mon Sep 17 00:00:00 2001 From: Richard Shadrach Date: Sat, 31 May 2025 06:54:06 -0400 Subject: [PATCH 2/4] Bump ci/deps --- ci/deps/actions-310-minimum_versions.yaml | 2 +- ci/deps/actions-310.yaml | 2 +- ci/deps/actions-311-downstream_compat.yaml | 2 +- ci/deps/actions-311-numpydev.yaml | 2 +- ci/deps/actions-311-pyarrownightly.yaml | 2 +- ci/deps/actions-311.yaml | 2 +- ci/deps/actions-312.yaml | 2 +- ci/deps/actions-313-freethreading.yaml | 1 + ci/deps/actions-313.yaml | 2 +- ci/deps/actions-pypy-39.yaml | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ci/deps/actions-310-minimum_versions.yaml b/ci/deps/actions-310-minimum_versions.yaml index f8522594f36f4..05db6c548eab4 100644 --- a/ci/deps/actions-310-minimum_versions.yaml +++ b/ci/deps/actions-310-minimum_versions.yaml @@ -8,7 +8,7 @@ dependencies: # build dependencies - versioneer - - cython>=0.29.33 + - cython~=3.1.0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index ea22bc411dedd..4b6c7bfb6e962 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -6,7 +6,7 @@ dependencies: # build dependencies - versioneer - - cython>=0.29.33 + - cython~=3.1.0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index e981be9891dec..decd516eed8ac 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -7,7 +7,7 @@ dependencies: # build dependencies - versioneer - - cython>=0.29.33 + - cython~=3.1.0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-311-numpydev.yaml b/ci/deps/actions-311-numpydev.yaml index 325a6d45d74fd..3aa0a53c0950d 100644 --- a/ci/deps/actions-311-numpydev.yaml +++ b/ci/deps/actions-311-numpydev.yaml @@ -8,7 +8,7 @@ dependencies: - versioneer - meson=1.2.1 - meson-python=0.13.1 - - cython>=0.29.33 + - cython~=3.1.0 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/actions-311-pyarrownightly.yaml b/ci/deps/actions-311-pyarrownightly.yaml index 2d3d11c294e12..1f5693f40d466 100644 --- a/ci/deps/actions-311-pyarrownightly.yaml +++ b/ci/deps/actions-311-pyarrownightly.yaml @@ -7,7 +7,7 @@ dependencies: # build dependencies - versioneer - meson=1.2.1 - - cython>=0.29.33 + - cython~=3.1.0 - meson-python=0.13.1 # test dependencies diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index f03d518fd22fb..2649418797ced 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -6,7 +6,7 @@ dependencies: # build dependencies - versioneer - - cython>=0.29.33 + - cython~=3.1.0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml index 58c6c2ca3210c..c906d790ae914 100644 --- a/ci/deps/actions-312.yaml +++ b/ci/deps/actions-312.yaml @@ -6,7 +6,7 @@ dependencies: # build dependencies - versioneer - - cython>=0.29.33 + - cython~=3.1.0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-313-freethreading.yaml b/ci/deps/actions-313-freethreading.yaml index d10c70bc1fbfb..a312d1fd77571 100644 --- a/ci/deps/actions-313-freethreading.yaml +++ b/ci/deps/actions-313-freethreading.yaml @@ -7,6 +7,7 @@ dependencies: # build dependencies - setuptools - versioneer + - cython~=3.1.0 - meson=1.8.0 - meson-python=0.18.0 diff --git a/ci/deps/actions-313.yaml b/ci/deps/actions-313.yaml index f94138a98e127..5ebc7df1131b0 100644 --- a/ci/deps/actions-313.yaml +++ b/ci/deps/actions-313.yaml @@ -6,7 +6,7 @@ dependencies: # build dependencies - versioneer - - cython>=0.29.33 + - cython~=3.1.0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-pypy-39.yaml b/ci/deps/actions-pypy-39.yaml index 90933b24b88db..08dcb859cc97d 100644 --- a/ci/deps/actions-pypy-39.yaml +++ b/ci/deps/actions-pypy-39.yaml @@ -9,7 +9,7 @@ dependencies: # build dependencies - versioneer - - cython>=0.29.33 + - cython~=3.1.0 - meson=1.2.1 - meson-python=0.13.1 From 870369642eebea7d22932038ca5f9ca15a0998c0 Mon Sep 17 00:00:00 2001 From: Richard Shadrach Date: Tue, 3 Jun 2025 16:02:57 -0400 Subject: [PATCH 3/4] Change pins to <4.0 --- ci/deps/actions-310-minimum_versions.yaml | 2 +- ci/deps/actions-310.yaml | 2 +- ci/deps/actions-311-downstream_compat.yaml | 2 +- ci/deps/actions-311-numpydev.yaml | 2 +- ci/deps/actions-311-pyarrownightly.yaml | 2 +- ci/deps/actions-311.yaml | 2 +- ci/deps/actions-312.yaml | 2 +- ci/deps/actions-313-freethreading.yaml | 4 +--- ci/deps/actions-313.yaml | 2 +- ci/deps/actions-pypy-39.yaml | 2 +- 10 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ci/deps/actions-310-minimum_versions.yaml b/ci/deps/actions-310-minimum_versions.yaml index 05db6c548eab4..26bbd36b29128 100644 --- a/ci/deps/actions-310-minimum_versions.yaml +++ b/ci/deps/actions-310-minimum_versions.yaml @@ -8,7 +8,7 @@ dependencies: # build dependencies - versioneer - - cython~=3.1.0 + - cython<4.0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 4b6c7bfb6e962..8c5661cba2cde 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -6,7 +6,7 @@ dependencies: # build dependencies - versioneer - - cython~=3.1.0 + - cython<4.0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index decd516eed8ac..0e5642b49f7d1 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -7,7 +7,7 @@ dependencies: # build dependencies - versioneer - - cython~=3.1.0 + - cython<4.0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-311-numpydev.yaml b/ci/deps/actions-311-numpydev.yaml index 3aa0a53c0950d..51a80cbe2513b 100644 --- a/ci/deps/actions-311-numpydev.yaml +++ b/ci/deps/actions-311-numpydev.yaml @@ -8,7 +8,7 @@ dependencies: - versioneer - meson=1.2.1 - meson-python=0.13.1 - - cython~=3.1.0 + - cython<4.0 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/actions-311-pyarrownightly.yaml b/ci/deps/actions-311-pyarrownightly.yaml index 1f5693f40d466..c5272b891f8c7 100644 --- a/ci/deps/actions-311-pyarrownightly.yaml +++ b/ci/deps/actions-311-pyarrownightly.yaml @@ -7,7 +7,7 @@ dependencies: # build dependencies - versioneer - meson=1.2.1 - - cython~=3.1.0 + - cython<4.0 - meson-python=0.13.1 # test dependencies diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 2649418797ced..3d53914cd01f8 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -6,7 +6,7 @@ dependencies: # build dependencies - versioneer - - cython~=3.1.0 + - cython<4.0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml index c906d790ae914..97292189e0d04 100644 --- a/ci/deps/actions-312.yaml +++ b/ci/deps/actions-312.yaml @@ -6,7 +6,7 @@ dependencies: # build dependencies - versioneer - - cython~=3.1.0 + - cython<4.0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-313-freethreading.yaml b/ci/deps/actions-313-freethreading.yaml index a312d1fd77571..2dbfe975757bf 100644 --- a/ci/deps/actions-313-freethreading.yaml +++ b/ci/deps/actions-313-freethreading.yaml @@ -7,7 +7,7 @@ dependencies: # build dependencies - setuptools - versioneer - - cython~=3.1.0 + - cython<4.0 - meson=1.8.0 - meson-python=0.18.0 @@ -22,10 +22,8 @@ dependencies: # optional dependencies - hypothesis>=6.84.0 - # Move Cython to build dependencies, once they release a version that supports freethreading - pip: # No free-threaded coveragepy (with the C-extension) on conda-forge yet - pytest-cov - "tzdata>=2022.7" - "--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" - - "cython" diff --git a/ci/deps/actions-313.yaml b/ci/deps/actions-313.yaml index 5ebc7df1131b0..fd36aae833cc3 100644 --- a/ci/deps/actions-313.yaml +++ b/ci/deps/actions-313.yaml @@ -6,7 +6,7 @@ dependencies: # build dependencies - versioneer - - cython~=3.1.0 + - cython<4.0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-pypy-39.yaml b/ci/deps/actions-pypy-39.yaml index 08dcb859cc97d..56268ae26b35f 100644 --- a/ci/deps/actions-pypy-39.yaml +++ b/ci/deps/actions-pypy-39.yaml @@ -9,7 +9,7 @@ dependencies: # build dependencies - versioneer - - cython~=3.1.0 + - cython<4.0 - meson=1.2.1 - meson-python=0.13.1 From b3d5778e632c6dd134d4b59673957bf51c8ef39c Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Tue, 3 Jun 2025 18:33:12 -0700 Subject: [PATCH 4/4] Pin more below 4.0.0a0 --- ci/deps/actions-310-minimum_versions.yaml | 2 +- ci/deps/actions-310.yaml | 2 +- ci/deps/actions-311-downstream_compat.yaml | 2 +- ci/deps/actions-311-numpydev.yaml | 2 +- ci/deps/actions-311-pyarrownightly.yaml | 2 +- ci/deps/actions-311.yaml | 2 +- ci/deps/actions-312.yaml | 2 +- ci/deps/actions-313-freethreading.yaml | 2 +- ci/deps/actions-313.yaml | 2 +- ci/deps/actions-pypy-39.yaml | 2 +- environment.yml | 2 +- pyproject.toml | 2 +- requirements-dev.txt | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ci/deps/actions-310-minimum_versions.yaml b/ci/deps/actions-310-minimum_versions.yaml index 26bbd36b29128..eaba29c2f796e 100644 --- a/ci/deps/actions-310-minimum_versions.yaml +++ b/ci/deps/actions-310-minimum_versions.yaml @@ -8,7 +8,7 @@ dependencies: # build dependencies - versioneer - - cython<4.0 + - cython<4.0.0a0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 8c5661cba2cde..fbeabb56a62d0 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -6,7 +6,7 @@ dependencies: # build dependencies - versioneer - - cython<4.0 + - cython<4.0.0a0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index 0e5642b49f7d1..07f865868573d 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -7,7 +7,7 @@ dependencies: # build dependencies - versioneer - - cython<4.0 + - cython<4.0.0a0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-311-numpydev.yaml b/ci/deps/actions-311-numpydev.yaml index 51a80cbe2513b..99cbe0415b4f9 100644 --- a/ci/deps/actions-311-numpydev.yaml +++ b/ci/deps/actions-311-numpydev.yaml @@ -8,7 +8,7 @@ dependencies: - versioneer - meson=1.2.1 - meson-python=0.13.1 - - cython<4.0 + - cython<4.0.0a0 # test dependencies - pytest>=7.3.2 diff --git a/ci/deps/actions-311-pyarrownightly.yaml b/ci/deps/actions-311-pyarrownightly.yaml index c5272b891f8c7..da0cecda0fb46 100644 --- a/ci/deps/actions-311-pyarrownightly.yaml +++ b/ci/deps/actions-311-pyarrownightly.yaml @@ -7,7 +7,7 @@ dependencies: # build dependencies - versioneer - meson=1.2.1 - - cython<4.0 + - cython<4.0.0a0 - meson-python=0.13.1 # test dependencies diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 3d53914cd01f8..9ab82d69504fb 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -6,7 +6,7 @@ dependencies: # build dependencies - versioneer - - cython<4.0 + - cython<4.0.0a0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml index 97292189e0d04..d12fe4f7d6e49 100644 --- a/ci/deps/actions-312.yaml +++ b/ci/deps/actions-312.yaml @@ -6,7 +6,7 @@ dependencies: # build dependencies - versioneer - - cython<4.0 + - cython<4.0.0a0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-313-freethreading.yaml b/ci/deps/actions-313-freethreading.yaml index 2dbfe975757bf..14e3ade976b01 100644 --- a/ci/deps/actions-313-freethreading.yaml +++ b/ci/deps/actions-313-freethreading.yaml @@ -7,7 +7,7 @@ dependencies: # build dependencies - setuptools - versioneer - - cython<4.0 + - cython<4.0.0a0 - meson=1.8.0 - meson-python=0.18.0 diff --git a/ci/deps/actions-313.yaml b/ci/deps/actions-313.yaml index fd36aae833cc3..57ed0ea062398 100644 --- a/ci/deps/actions-313.yaml +++ b/ci/deps/actions-313.yaml @@ -6,7 +6,7 @@ dependencies: # build dependencies - versioneer - - cython<4.0 + - cython<4.0.0a0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/ci/deps/actions-pypy-39.yaml b/ci/deps/actions-pypy-39.yaml index 56268ae26b35f..e0ddc6954e4a4 100644 --- a/ci/deps/actions-pypy-39.yaml +++ b/ci/deps/actions-pypy-39.yaml @@ -9,7 +9,7 @@ dependencies: # build dependencies - versioneer - - cython<4.0 + - cython<4.0.0a0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/environment.yml b/environment.yml index 61b0d11ecd7eb..8926c85143e2b 100644 --- a/environment.yml +++ b/environment.yml @@ -8,7 +8,7 @@ dependencies: # build dependencies - versioneer - - cython~=3.1.0 + - cython<4.0.0a0 - meson=1.2.1 - meson-python=0.13.1 diff --git a/pyproject.toml b/pyproject.toml index 370bd0e0605cb..b17a1eacfa717 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ requires = [ "meson-python>=0.13.1", "meson>=1.2.1,<2", "wheel", - "Cython==3.1.0rc1", # Note: sync with setup.py, environment.yml and asv.conf.json + "Cython<4.0.0a0", # Note: sync with setup.py, environment.yml and asv.conf.json # Force numpy higher than 2.0rc1, so that built wheels are compatible # with both numpy 1 and 2 "numpy>=2.0.0rc1", diff --git a/requirements-dev.txt b/requirements-dev.txt index 682d18f2f7c1b..6515797bc3b9d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ pip versioneer[toml] -cython~=3.1.0 +cython<4.0.0a0 meson[ninja]==1.2.1 meson-python==0.13.1 pytest>=7.3.2