Skip to content

Support Cython 3.0 #593

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
merged 7 commits into from
Nov 5, 2023
Merged

Support Cython 3.0 #593

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29ae879
Explicitly annotate the GEOSMessageHandler typedef as noexcept
musicinmybrain Nov 4, 2023
c6b5019
Allow Cython 3.0
musicinmybrain Nov 4, 2023
c87733b
Revert "Fix manylinux workflow to stay on Cython 0.29.x"
musicinmybrain Nov 4, 2023
86716ee
Update requirements-setup.txt
molinav Nov 4, 2023
f5b9796
Add optional legacy_implicit_noexcept directive in setup.py
molinav Nov 5, 2023
5952342
Revert noexcept declarations with noexcept comment
molinav Nov 5, 2023
4652b31
Update CHANGELOG with PR #593
molinav Nov 5, 2023
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 .github/workflows/basemap-for-manylinux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ jobs:
export NUMPY_INCLUDE_PATH=${sitepkgdir}/numpy/core/include
if [ "${{ matrix.python-version }}" = "3.11" ]; then
kwds="--no-build-isolation"
pip install setuptools wheel "cython >= 0.29, < 3.0"
pip install setuptools wheel "cython >= 0.29, < 3.1"
fi
cd ${{ env.PKGDIR }}
python setup.py sdist
Expand Down
2 changes: 1 addition & 1 deletion packages/basemap/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ requires = [
'numpy == 1.16.6; sys_platform != "darwin" and (python_version >= "3.7" and python_version <= "3.9")',
'numpy == 1.16.6; python_version == "2.7" or (python_version >= "3.4" and python_version <= "3.6")',
'numpy == 1.11.3; python_version == "2.6" or (python_version >= "3.2" and python_version <= "3.3")',
'cython >= 0.29, < 3.0; python_version >= "3.3" or python_version < "3.0"',
'cython >= 0.29, < 3.1; python_version >= "3.3" or python_version < "3.0"',
'cython >= 0.26, < 0.27; python_version == "3.2"'
]
build-backend = "setuptools.build_meta"
4 changes: 3 additions & 1 deletion packages/basemap/requirements-setup.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
cython >= 0.29, < 3.0; python_version == "2.6"
cython >= 0.29, < 3.0; python_version == "2.7"
cython >= 0.26, < 0.27; python_version == "3.2"
cython >= 0.29, < 3.0; python_version >= "3.3"
cython >= 0.29, < 3.0; python_version == "3.3"
cython >= 0.29, < 3.0; python_version == "3.4"
cython >= 0.29, < 3.1; python_version >= "3.5"
6 changes: 3 additions & 3 deletions packages/basemap/src/_geoslib.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ cdef extern from "geos_c.h":
pass
ctypedef struct GEOSCoordSeq:
pass
ctypedef void (*GEOSMessageHandler)(char *fmt, char *list)
ctypedef void (*GEOSMessageHandler)(char *fmt, char *list) noexcept
char *GEOSversion()
void initGEOS(GEOSMessageHandler notice_function, GEOSMessageHandler error_function)
void finishGEOS()
Expand Down Expand Up @@ -105,7 +105,7 @@ cdef extern from "geos_c.h":
GEOSCoordSeq *GEOSGeom_getCoordSeq(GEOSGeom* g)
int GEOSCoordSeq_getSize(GEOSCoordSeq *s, unsigned int *size)

cdef void notice_h(char *fmt, char*msg):
cdef void notice_h(char *fmt, char*msg) noexcept:
pass
#format = PyBytes_FromString(fmt)
#message = PyBytes_FromString(msg)
Expand All @@ -115,7 +115,7 @@ cdef void notice_h(char *fmt, char*msg):
# warn_msg = format
#sys.stdout.write('GEOS_NOTICE: %s\n' % warn_msg)

cdef void error_h(char *fmt, char*msg):
cdef void error_h(char *fmt, char*msg) noexcept:
format = PyBytes_FromString(fmt)
message = PyBytes_FromString(msg)
try:
Expand Down