update to Cython 3 #1567
Merged
update to Cython 3 #1567
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
emlys
commented
May 7, 2024
| @@ -46,14 +46,14 @@ def run(self): | |||
|
|
|||
| setup( | |||
| install_requires=_REQUIREMENTS, | |||
| ext_modules=[ | |||
| ext_modules=cythonize([ | |||
There was a problem hiding this comment.
Using cythonize rather than cython's build_ext seems to be more standard nowadays, and lets us set the language level directive.
emlys
commented
May 7, 2024
| @@ -129,9 +127,9 @@ cdef class _ManagedRaster: | |||
| self.block_xbits = numpy.log2(self.block_xsize) | |||
| self.block_ybits = numpy.log2(self.block_ysize) | |||
| self.block_nx = ( | |||
| self.raster_x_size + (self.block_xsize) - 1) / self.block_xsize | |||
| self.raster_x_size + (self.block_xsize) - 1) // self.block_xsize | |||
There was a problem hiding this comment.
Was relying on python 2 style integer division. Now we need to explicitly use floor division.
emlys
commented
May 7, 2024
| @@ -10,7 +10,6 @@ | |||
| # scripts/convert-requirements-to-conda-yml.py as though it can only be found | |||
| # on pip. | |||
|
|
|||
| Cython<3.0.0 | |||
There was a problem hiding this comment.
Cython doesn't really belong in requirements because it's only needed to build invest, and because it's listed under build-system.requires in pyproject.toml, pip installs it for us in a separate virtual environment at build time.
emlys
commented
May 7, 2024
| extra_compile_args=compiler_and_linker_args, | ||
| extra_link_args=compiler_and_linker_args, | ||
| language='c++' | ||
| language='c++', | ||
| define_macros=[("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")] |
There was a problem hiding this comment.
This takes care of the deprecated numpy API warnings we've had forever.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes #556
Checklist