Skip to content

Commit ca218b2

Browse files
authored
unpin cython (#3269)
follow up to #3264
1 parent 99e6eb1 commit ca218b2

File tree

2 files changed

+23
-5
lines changed

2 files changed

+23
-5
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -390,13 +390,11 @@ jobs:
390390
- python: '3.9' # We support running on cython 2 and 3 for 3.9
391391
cython: '<3' # cython 2
392392
- python: '3.9'
393-
# cython 3.1.0 broke stuff https://github.com/cython/cython/issues/6865
394-
cython: '>=3,<3.1' # cython 3 (or greater)
393+
cython: '>=3' # cython 3 (or greater)
395394
- python: '3.11' # 3.11 is the last version Cy2 supports
396395
cython: '<3' # cython 2
397396
- python: '3.13' # We support running cython3 on 3.13
398-
# cython 3.1.0 broke stuff https://github.com/cython/cython/issues/6865
399-
cython: '>=3,<3.1' # cython 3 (or greater)
397+
cython: '>=3' # cython 3 (or greater)
400398
steps:
401399
- name: Retrieve the project source from an sdist inside the GHA artifact
402400
uses: re-actors/checkout-python-sdist@release/v2

tox.ini

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ commands =
5353
description = "Run cython tests."
5454
deps =
5555
# cython 3.1.0 broke stuff https://github.com/cython/cython/issues/6865
56-
cython: cython<3.1.0
56+
cython: cython
5757
cython2: cython<3
5858
setuptools ; python_version >= '3.12'
5959
commands_pre =
@@ -63,6 +63,26 @@ commands_pre =
6363
commands =
6464
python -m tests.cython.run_test_cython
6565

66+
[testenv:cov-cython]
67+
deps =
68+
setuptools
69+
cython
70+
set_env =
71+
CFLAGS= -DCYTHON_TRACE_NOGIL=1A
72+
allowlist_externals =
73+
sed
74+
cp
75+
commands_pre =
76+
python --version
77+
cython --version
78+
cp pyproject.toml {temp_dir}/
79+
sed -i "s/plugins\ =\ \\[\\]/plugins = [\"Cython.Coverage\"]/" {temp_dir}/pyproject.toml
80+
cythonize --inplace -X linetrace=True tests/cython/test_cython.pyx
81+
commands =
82+
coverage run -m tests.cython.run_test_cython --rcfile={temp_dir}/pyproject.toml
83+
coverage combine
84+
coverage report
85+
6686
[testenv:gen_exports]
6787
description = "Run gen_exports.py, regenerating code for public API wrappers."
6888
deps =

0 commit comments

Comments
 (0)