Skip to content

unpin cython #3269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jakkdl merged 2 commits into from
May 21, 2025
Merged

unpin cython #3269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9af6d13
unpin cython
jakkdl May 19, 2025
abd43c4
add cov-cython tox env
jakkdl May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,13 +390,11 @@ jobs:
- python: '3.9' # We support running on cython 2 and 3 for 3.9
cython: '<3' # cython 2
- python: '3.9'
# cython 3.1.0 broke stuff https://github.com/cython/cython/issues/6865
cython: '>=3,<3.1' # cython 3 (or greater)
cython: '>=3' # cython 3 (or greater)
- python: '3.11' # 3.11 is the last version Cy2 supports
cython: '<3' # cython 2
- python: '3.13' # We support running cython3 on 3.13
# cython 3.1.0 broke stuff https://github.com/cython/cython/issues/6865
cython: '>=3,<3.1' # cython 3 (or greater)
cython: '>=3' # cython 3 (or greater)
steps:
- name: Retrieve the project source from an sdist inside the GHA artifact
uses: re-actors/checkout-python-sdist@release/v2
Expand Down
22 changes: 21 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ commands =
description = "Run cython tests."
deps =
# cython 3.1.0 broke stuff https://github.com/cython/cython/issues/6865
cython: cython<3.1.0
cython: cython
cython2: cython<3
setuptools ; python_version >= '3.12'
commands_pre =
Expand All @@ -63,6 +63,26 @@ commands_pre =
commands =
python -m tests.cython.run_test_cython

[testenv:cov-cython]
Copy link
Contributor

@A5rocks A5rocks May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would rather either have this in CI or delay this part of this PR until that point, so it doesn't get stale.

Copy link
Member Author

@jakkdl jakkdl May 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that logic would apply to everything in this file, and I think keeping it lowers the barrier to incorporating it to CI when that day comes around even if it does become stale

Copy link
Contributor

@A5rocks A5rocks May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well not the typing things! But alright, fine.

deps =
setuptools
cython
set_env =
CFLAGS= -DCYTHON_TRACE_NOGIL=1A
Copy link
Member

@webknjaz webknjaz May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is 1A?

Copy link
Member Author

@jakkdl jakkdl May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, yeah that should be a 1 🙏

Copy link
Member Author

@jakkdl jakkdl May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in #3272

allowlist_externals =
sed
cp
commands_pre =
python --version
cython --version
cp pyproject.toml {temp_dir}/
sed -i "s/plugins\ =\ \\[\\]/plugins = [\"Cython.Coverage\"]/" {temp_dir}/pyproject.toml
cythonize --inplace -X linetrace=True tests/cython/test_cython.pyx
commands =
coverage run -m tests.cython.run_test_cython --rcfile={temp_dir}/pyproject.toml
coverage combine
coverage report

[testenv:gen_exports]
description = "Run gen_exports.py, regenerating code for public API wrappers."
deps =
Expand Down
Loading