Skip to content

Commit 293550e

Browse files
rhshadrachmroeschke
authored andcommitted
Backport PR pandas-dev#61519: BUILD: Bump Cython to 3.1
1 parent 11c120c commit 293550e

14 files changed

+106
-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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: pandas-dev-313-freethreading
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python-freethreading
6+
7+
# build dependencies
8+
- setuptools
9+
- versioneer
10+
- cython<4.0.0a0
11+
- meson=1.8.0
12+
- meson-python=0.18.0
13+
14+
# test dependencies
15+
- pytest>=7.3.2
16+
- pytest-xdist>=2.2.0
17+
18+
# required dependencies
19+
- python-dateutil
20+
- numpy
21+
22+
# optional dependencies
23+
- hypothesis>=6.46.1
24+
25+
- pip:
26+
# No free-threaded coveragepy (with the C-extension) on conda-forge yet
27+
- pytest-cov
28+
- "tzdata>=2022.7"
29+
- "--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"

ci/deps/actions-313.yaml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: pandas-dev-313
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.13
6+
7+
# build dependencies
8+
- versioneer
9+
- cython<4.0.0a0
10+
- meson=1.2.1
11+
- meson-python=0.13.1
12+
13+
# test dependencies
14+
- pytest>=7.3.2
15+
- pytest-cov
16+
- pytest-xdist>=2.2.0
17+
- pytest-localserver>=0.8.1
18+
- pytest-qt>=4.4.0
19+
- boto3
20+
21+
# required dependencies
22+
- python-dateutil
23+
- numpy
24+
25+
# optional dependencies
26+
- beautifulsoup4>=4.11.2
27+
- blosc>=1.21.3
28+
- bottleneck>=1.3.6
29+
- fastparquet>=2022.12.0
30+
- fsspec>=2022.11.0
31+
- html5lib>=1.1
32+
- hypothesis>=6.46.1
33+
- gcsfs>=2022.11.0
34+
- jinja2>=3.1.2
35+
- lxml>=4.9.2
36+
- matplotlib>=3.6.3
37+
- numba>=0.56.4
38+
- numexpr>=2.8.4
39+
- odfpy>=1.4.1
40+
- qtpy>=2.3.0
41+
- pyqt>=5.15.9
42+
- openpyxl>=3.1.0
43+
- psycopg2>=2.9.6
44+
- pyarrow>=10.0.1
45+
- pymysql>=1.0.2
46+
- pyreadstat>=1.2.0
47+
- pytables>=3.8.0
48+
- python-calamine>=0.1.7
49+
- pytz>=2023.4
50+
- pyxlsb>=1.0.10
51+
- s3fs>=2022.11.0
52+
- scipy>=1.10.0
53+
- sqlalchemy>=2.0.0
54+
- tabulate>=0.9.0
55+
- xarray>=2022.12.0
56+
- xlrd>=2.0.1
57+
- xlsxwriter>=3.0.5
58+
- zstandard>=0.19.0
59+
60+
- pip:
61+
- adbc-driver-postgresql>=0.10.0
62+
- adbc-driver-sqlite>=0.8.0
63+
- tzdata>=2022.7

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)