fix: syntax error in setup.py + modernize #237
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| include python/zfpy.pxd | ||
| include python/zfpy.pyx | ||
| recursive-include include *.h | ||
| recursive-include src *.c *.h | ||
| include LICENSE | ||
| include pyproject.toml |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| [build-system] | ||
| requires = [ | ||
| "setuptools", | ||
| "wheel", | ||
| "cython", | ||
| "oldest-supported-numpy; python_version<'3.9'", | ||
| 'numpy; python_version>="3.9"', | ||
| ] | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| # cython: language_level=3 | ||
|
|
||
| import cython | ||
| cimport libc.stdint as stdint | ||
| from libc.stddef cimport ptrdiff_t | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| # cython: language_level=3 | ||
|
|
||
| import sys | ||
| import operator | ||
| import functools | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,48 @@ | ||
| from setuptools import setup, Extension | ||
|
|
||
| class NumpyImport: | ||
| def __repr__(self): | ||
| import numpy as np | ||
|
|
||
| return np.get_include() | ||
|
Comment on lines
+3
to
+7
There was a problem hiding this comment. I don't understand the point of this class. I think it's meant to defer the import of There was a problem hiding this comment. @william-silversmith Can you please address these questions? There was a problem hiding this comment. Yes, the point of the script is to delay the import of numpy. Originally, importing numpy concurrently with installation would cause the setup script to crash as numpy would not be found. This was a solution I found on StackOverflow. Later on, new python versions would not properly render the repr, so it was necessary to add str to get it to evaluate properly, but you might be right that it has rendered the delay mechanism superfluous. There was a problem hiding this comment. @william-silversmith Thanks for explaining (and for contributing this solution). |
||
|
|
||
| __fspath__ = __repr__ | ||
|
|
||
| setup( | ||
| name="zfpy", | ||
| setup_requires=["numpy", "cython"], | ||
| version="1.0.1", | ||
| author="Peter Lindstrom, Danielle Asher", | ||
| author_email="zfp@llnl.gov", | ||
| url="https://zfp.llnl.gov", | ||
| license="License :: OSI Approved :: BSD License", | ||
| description="zfp compression in Python", | ||
| long_description="zfp is a compressed format for representing multidimensional floating-point and integer arrays. zfp provides compressed-array classes that support high throughput read and write random access to individual array elements. zfp also supports serial and parallel compression of whole arrays using both lossless and lossy compression with error tolerances. zfp is primarily written in C and C++ but also includes Python and Fortran bindings.", | ||
| ext_modules=[ | ||
| Extension( | ||
| "zfpy", | ||
| sources=["python/zfpy.pyx"], | ||
| include_dirs=["include", str(NumpyImport())], | ||
| libraries=["zfp"], | ||
| library_dirs=["build/lib64", "build/lib/Release"], | ||
| language_level=3, | ||
| lanugage="c", | ||
| ), | ||
| ], | ||
| classifiers=[ | ||
| "Intended Audience :: Developers", | ||
| "Development Status :: 4 - Beta", | ||
| "License :: OSI Approved :: BSD License", | ||
| "Programming Language :: Python :: 3", | ||
| "Programming Language :: Python :: 3.8", | ||
| "Programming Language :: Python :: 3.9", | ||
| "Programming Language :: Python :: 3.10", | ||
| "Programming Language :: Python :: 3.11", | ||
| "Programming Language :: Python :: 3.12", | ||
| "Topic :: Scientific/Engineering :: Image Processing", | ||
| "Topic :: System :: Archiving :: Compression", | ||
| "Operating System :: POSIX", | ||
| "Operating System :: MacOS", | ||
| "Operating System :: Microsoft :: Windows :: Windows 10", | ||
| ], | ||
| ) | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wheelis from some outdated documentation; you probably don't need it for your build. It should be automatically installed where necessary.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@william-silversmith Here's a second question that you may be able to answer. I unfortunately have minimal knowledge of Python, though I suspect it is related to our zfpy-wheels repo for building and uploading wheels to PyPI.