Skip to content

Adopt cython3 (require >=3) #460

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
trexfeathers merged 6 commits into from
Sep 20, 2024
Merged

Adopt cython3 (require >=3) #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
85ca035
Adopt cython3 (now required)
pp-mo Sep 19, 2024
472171d
Merge branch 'main' into cython3
pp-mo Sep 20, 2024
a7f476b
Suppress the obsolete warning about numpy v1.7 api, only in Cython<3.
pp-mo Sep 20, 2024
a53ae20
Assert python 3 syntax for Cython source, just to be clear.
pp-mo Sep 20, 2024
55ba221
remove unnecessary cibuildwheel option.
pp-mo Sep 20, 2024
f201251
Review changes : tweak comment.
pp-mo Sep 20, 2024
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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ requires = [
"setuptools_scm[toml]>=7.0",
"wheel",
"oldest-supported-numpy",
"Cython"
"Cython>=3.0"
]
# Defined by PEP 517
build-backend = "setuptools.build_meta"
Expand Down
2 changes: 1 addition & 1 deletion requirements/cf-units.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
# setup dependencies
- setuptools >=45
- setuptools_scm >=7.0
- cython
- cython >=3.0
- numpy

# core dependencies
Expand Down
8 changes: 6 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
cythonize = False

COMPILER_DIRECTIVES = {}
DEFINE_MACROS = None
# This Cython macro disables a build warning, obsolete with Cython>=3
# see : https://cython.readthedocs.io/en/latest/src/userguide/migrating_to_cy30.html#numpy-c-api
DEFINE_MACROS = [("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")]
FLAG_COVERAGE = "--cython-coverage" # custom flag enabling Cython line tracing
BASEDIR = Path(__file__).resolve().parent
PACKAGE = "cf_units"
Expand Down Expand Up @@ -119,7 +121,7 @@ def _set_builtin(name, value):

if FLAG_COVERAGE in sys.argv or environ.get("CYTHON_COVERAGE", None):
COMPILER_DIRECTIVES = {"linetrace": True}
DEFINE_MACROS = [("CYTHON_TRACE", "1"), ("CYTHON_TRACE_NOGIL", "1")]
DEFINE_MACROS += [("CYTHON_TRACE", "1"), ("CYTHON_TRACE_NOGIL", "1")]
if FLAG_COVERAGE in sys.argv:
sys.argv.remove(FLAG_COVERAGE)
print('enable: "linetrace" Cython compiler directive')
Expand All @@ -142,6 +144,8 @@ def _set_builtin(name, value):
[udunits_ext] = cythonize(
udunits_ext,
compiler_directives=COMPILER_DIRECTIVES,
# Assert python 3 source syntax: Currently required to suppress a warning,
# even though this is now the default (as-of Cython v3).
language_level="3str",
)

Expand Down