Skip to content

Commit 0bf73ec

Browse files
authored
Merge pull request #615 from cvanelteren/cython-hotfix
Add necessary noexcept for more recent cython
2 parents 4974855 + 3133833 commit 0bf73ec

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

packages/basemap/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ requires = [
33
'setuptools',
44
'wheel',
55
'numpy == 2.0.0',
6-
'cython >= 0.29, < 3.1',
6+
'cython >= 0.29.31, < 3.1',
77
]
88
build-backend = "setuptools.build_meta"
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
cython >= 0.29, < 3.1; python_version >= "3.3" or python_version < "3.0"
2-
cython >= 0.26, < 0.27; python_version == "3.2"
1+
cython >= 0.29.31, < 3.1

packages/basemap/setup.py

-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ def run(self):
162162
for ext in ext_modules:
163163
ext.cython_directives = [
164164
("language_level", str(sys.version_info[0])),
165-
("legacy_implicit_noexcept", True),
166165
][:1 + int(cython_major_version >= 3)]
167166

168167
# Define all the different requirements.

packages/basemap/src/_geoslib.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ cdef extern from "geos_c.h":
112112
# Cython 3: Next cdef needs "noexcept" declaration unless
113113
# the compiler directive "legacy_implicit_noexcept" is used
114114
# ("noexcept" syntax supported since Cython 0.29.31).
115-
cdef void notice_h(const char *fmt, ...):
115+
cdef void notice_h(const char *fmt, ...) noexcept:
116116
pass
117117
#format = PyBytes_FromString(fmt)
118118
#message = PyBytes_FromString(msg)

0 commit comments

Comments
 (0)