Skip to content

Commit

Permalink
Merge branch 'main' into simplify-test-conda
Browse files Browse the repository at this point in the history
  • Loading branch information
dstansby authored Jan 4, 2025
2 parents fbd4159 + 7cdffa1 commit f722e99
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
4 changes: 4 additions & 0 deletions docs/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ Fixes
* Fixes issue with ``Delta`` Zarr 3 codec not working with ``astype``.
By :user:`Norman Rzepka <normanrz>`, :issue:`664`

* Removed Version Check: The previous code included a check for the `NumPy` version
and a warning if the version was incompatible with `zfpy`.
This check has been removed because `zfpy` now supports the newer versions of `NumPy`.
By :user:`Meher Gajula <me-her>`, :issue:`672`

Improvements
~~~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion numcodecs/zfpy.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
if _zfpy_version:
# Check NumPy version
_numpy_version: tuple = tuple(map(int, version("numpy").split('.')))
if _numpy_version >= (2, 0, 0) and _zfpy_version <= (1, 0, 1): # pragma: no cover
if _numpy_version >= (2, 0, 0) and _zfpy_version < (1, 0, 1): # pragma: no cover
_zfpy_version = ()
warnings.warn(
"NumPy version >= 2.0.0 detected. The zfpy library is incompatible with this version of NumPy. "
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ msgpack = [
"msgpack",
]
zfpy = [
"zfpy>=1.0.0",
"numpy<2.0.0",
"zfpy>=1.0.0"
]
pcodec = [
"pcodec>=0.3,<0.4",
Expand Down

0 comments on commit f722e99

Please sign in to comment.