Skip to content

Commit 0f4df0a

Browse files
lithomas1mroeschke
authored andcommitted
CI: Unpin Cython (pandas-dev#54784)
* CI: Unpin Cython * Update actions-311-numpydev.yaml * disable cache for now * try bumping meson * bump meson everywhere --------- Co-authored-by: Matthew Roeschke <[email protected]>
1 parent c65254d commit 0f4df0a

14 files changed

+28
-28
lines changed

.github/workflows/unit-tests.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ jobs:
233233
run: |
234234
/opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev
235235
. ~/virtualenvs/pandas-dev/bin/activate
236-
python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.0.1 meson-python==0.13.1
237-
python -m pip install --no-cache-dir versioneer[toml] "cython<3.0.1" numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.46.1
236+
python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.2.1 meson-python==0.13.1
237+
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.46.1
238238
python -m pip install --no-cache-dir --no-build-isolation -e .
239239
python -m pip list --no-cache-dir
240240
export PANDAS_CI=1
@@ -271,8 +271,8 @@ jobs:
271271
run: |
272272
/opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev
273273
. ~/virtualenvs/pandas-dev/bin/activate
274-
python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.0.1
275-
python -m pip install --no-cache-dir versioneer[toml] "cython<3.0.1" numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.46.1
274+
python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
275+
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.46.1
276276
python -m pip install --no-cache-dir --no-build-isolation -e .
277277
python -m pip list --no-cache-dir
278278
@@ -342,10 +342,10 @@ jobs:
342342
- name: Build Environment
343343
run: |
344344
python --version
345-
python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.0.1 meson-python==0.13.1
345+
python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1
346346
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
347347
python -m pip install versioneer[toml]
348-
python -m pip install python-dateutil pytz tzdata "cython<3.0.1" hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-cov pytest-asyncio>=0.17
348+
python -m pip install python-dateutil pytz tzdata cython hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-cov pytest-asyncio>=0.17
349349
python -m pip install -ve . --no-build-isolation --no-index
350350
python -m pip list
351351

ci/deps/actions-310.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ dependencies:
66

77
# build dependencies
88
- versioneer[toml]
9-
- cython>=0.29.33, <3.0.1
10-
- meson[ninja]=1.0.1
9+
- cython>=0.29.33
10+
- meson[ninja]=1.2.1
1111
- meson-python=0.13.1
1212

1313
# test dependencies

ci/deps/actions-311-downstream_compat.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ dependencies:
77

88
# build dependencies
99
- versioneer[toml]
10-
- cython>=0.29.33, <3.0.1
11-
- meson[ninja]=1.0.1
10+
- cython>=0.29.33
11+
- meson[ninja]=1.2.1
1212
- meson-python=0.13.1
1313

1414
# test dependencies

ci/deps/actions-311-numpydev.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ dependencies:
66

77
# build dependencies
88
- versioneer[toml]
9-
- meson[ninja]=1.0.1
9+
- meson[ninja]=1.2.1
1010
- meson-python=0.13.1
11+
- cython>=0.29.33
1112

1213
# test dependencies
1314
- pytest>=7.3.2
@@ -25,7 +26,6 @@ dependencies:
2526
- pip
2627

2728
- pip:
28-
- "cython<3.0.1"
2929
- "--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
3030
- "--pre"
3131
- "numpy"

ci/deps/actions-311-pyarrownightly.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ dependencies:
66

77
# build dependencies
88
- versioneer[toml]
9-
- meson[ninja]=1.0.1
10-
- cython>=0.29.33, <3.0.1
9+
- meson[ninja]=1.2.1
10+
- cython>=0.29.33
1111
- meson-python=0.13.1
1212

1313
# test dependencies

ci/deps/actions-311.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ dependencies:
66

77
# build dependencies
88
- versioneer[toml]
9-
- cython>=0.29.33, <3.0.1
10-
- meson[ninja]=1.0.1
9+
- cython>=0.29.33
10+
- meson[ninja]=1.2.1
1111
- meson-python=0.13.1
1212

1313
# test dependencies

ci/deps/actions-39-minimum_versions.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ dependencies:
88

99
# build dependencies
1010
- versioneer[toml]
11-
- cython>=0.29.33, <3.0.1
12-
- meson[ninja]=1.0.1
11+
- cython>=0.29.33
12+
- meson[ninja]=1.2.1
1313
- meson-python=0.13.1
1414

1515
# test dependencies

ci/deps/actions-39.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ dependencies:
66

77
# build dependencies
88
- versioneer[toml]
9-
- cython>=0.29.33, <3.0.1
10-
- meson[ninja]=1.0.1
9+
- cython>=0.29.33
10+
- meson[ninja]=1.2.1
1111
- meson-python=0.13.1
1212

1313
# test dependencies

ci/deps/actions-pypy-39.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ dependencies:
99

1010
# build dependencies
1111
- versioneer[toml]
12-
- cython>=0.29.33, <3.0.1
13-
- meson[ninja]=1.0.1
12+
- cython>=0.29.33
13+
- meson[ninja]=1.2.1
1414
- meson-python=0.13.1
1515

1616
# test dependencies

ci/deps/circle-310-arm64.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ dependencies:
66

77
# build dependencies
88
- versioneer[toml]
9-
- cython>=0.29.33, <3.0.1
10-
- meson[ninja]=1.0.1
9+
- cython>=0.29.33
10+
- meson[ninja]=1.2.1
1111
- meson-python=0.13.1
1212

1313
# test dependencies

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
# build dependencies
1010
- versioneer[toml]
1111
- cython=0.29.33
12-
- meson[ninja]=1.0.1
12+
- meson[ninja]=1.2.1
1313
- meson-python=0.13.1
1414

1515
# test dependencies

meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ project(
44
'c', 'cpp', 'cython',
55
version: run_command(['generate_version.py', '--print'], check: true).stdout().strip(),
66
license: 'BSD-3',
7-
meson_version: '>=1.0.1',
7+
meson_version: '>=1.2.1',
88
default_options: [
99
'buildtype=release',
1010
'c_std=c99'

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# See https://github.com/scipy/scipy/pull/12940 for the AIX issue.
44
requires = [
55
"meson-python==0.13.1",
6-
"meson==1.0.1",
6+
"meson==1.2.1",
77
"wheel",
88
"Cython>=0.29.33,<3", # Note: sync with setup.py, environment.yml and asv.conf.json
99
# Note: numpy 1.25 has a backwards compatible C API by default

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
pip
55
versioneer[toml]
66
cython==0.29.33
7-
meson[ninja]==1.0.1
7+
meson[ninja]==1.2.1
88
meson-python==0.13.1
99
pytest>=7.3.2
1010
pytest-cov

0 commit comments

Comments
 (0)