Skip to content

Commit 1976447

Browse files
Backport PR #61519: BUILD: Bump Cython to 3.1 (#61558)
* Backport PR #61519: BUILD: Bump Cython to 3.1 * Remove files that don't exist on 2.3.x --------- Co-authored-by: Richard Shadrach <[email protected]>
1 parent 11c120c commit 1976447

12 files changed

+14
-13
lines changed

asv_bench/asv.conf.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
// pip (with all the conda available packages installed first,
4242
// followed by the pip installed packages).
4343
"matrix": {
44-
"Cython": ["3.0.5"],
44+
"pip+build": [],
45+
"Cython": [],
4546
"matplotlib": [],
4647
"sqlalchemy": [],
4748
"scipy": [],

ci/deps/actions-310-minimum_versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88

99
# build dependencies
1010
- versioneer
11-
- cython>=0.29.33
11+
- cython<4.0.0a0
1212
- meson=1.2.1
1313
- meson-python=0.13.1
1414

ci/deps/actions-310.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66

77
# build dependencies
88
- versioneer
9-
- cython>=0.29.33
9+
- cython<4.0.0a0
1010
- meson=1.2.1
1111
- meson-python=0.13.1
1212

ci/deps/actions-311-downstream_compat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77

88
# build dependencies
99
- versioneer
10-
- cython>=0.29.33
10+
- cython<4.0.0a0
1111
- meson=1.2.1
1212
- meson-python=0.13.1
1313

ci/deps/actions-311-numpydev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88
- versioneer
99
- meson=1.2.1
1010
- meson-python=0.13.1
11-
- cython>=0.29.33
11+
- cython<4.0.0a0
1212

1313
# test dependencies
1414
- pytest>=7.3.2

ci/deps/actions-311-pyarrownightly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
# build dependencies
88
- versioneer
99
- meson=1.2.1
10-
- cython>=0.29.33
10+
- cython<4.0.0a0
1111
- meson-python=0.13.1
1212

1313
# test dependencies

ci/deps/actions-311.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66

77
# build dependencies
88
- versioneer
9-
- cython>=0.29.33
9+
- cython<4.0.0a0
1010
- meson=1.2.1
1111
- meson-python=0.13.1
1212

ci/deps/actions-312.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66

77
# build dependencies
88
- versioneer
9-
- cython>=0.29.33
9+
- cython<4.0.0a0
1010
- meson=1.2.1
1111
- meson-python=0.13.1
1212

ci/deps/actions-pypy-39.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99

1010
# build dependencies
1111
- versioneer
12-
- cython>=0.29.33
12+
- cython<4.0.0a0
1313
- meson=1.2.1
1414
- meson-python=0.13.1
1515

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88

99
# build dependencies
1010
- versioneer
11-
- cython=3.0.5
11+
- cython<4.0.0a0
1212
- meson=1.2.1
1313
- meson-python=0.13.1
1414

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ requires = [
55
"meson-python>=0.13.1",
66
"meson>=1.2.1,<2",
77
"wheel",
8-
"Cython~=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json
9-
# Force numpy higher than 2.0, so that built wheels are compatible
8+
"Cython<4.0.0a0", # Note: sync with setup.py, environment.yml and asv.conf.json
9+
# Force numpy higher than 2.0rc1, so that built wheels are compatible
1010
# with both numpy 1 and 2
1111
"numpy>=2.0",
1212
"versioneer[toml]"

requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
pip
55
versioneer[toml]
6-
cython==3.0.5
6+
cython<4.0.0a0
77
meson[ninja]==1.2.1
88
meson-python==0.13.1
99
pytest>=7.3.2

0 commit comments

Comments
 (0)