numcodecs 0.14.0__tar.gz → 0.14.1__tar.gz

{numcodecs-0.14.0 → numcodecs-0.14.1}/.github/workflows/ci.yaml

@@ -78,7 +78,7 @@ jobs:
         run: |
           conda activate env
           # TODO: remove --pre option when zarr v3 is out
-          python -m pip install --pre zarr
+          python -m pip install --pre zarr>=3.0.0b2
 
       # This is used to test with zfpy, which does not yet support numpy 2.0
       - name: Install older numpy and zfpy
@@ -100,7 +100,7 @@ jobs:
           conda activate env
           pytest -v
 
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true

{numcodecs-0.14.0 → numcodecs-0.14.1}/.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
     - id: debug-statements
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.3
+    rev: v0.7.4
     hooks:
     - id: ruff
       args: ["--fix", "--show-fixes"]
@@ -27,8 +27,8 @@ repos:
     - id: sp-repo-review
 
   -   repo: https://github.com/pre-commit/mirrors-mypy
-      rev: 'v1.4.0'
+      rev: 'v1.13.0'
       hooks:
       -   id: mypy
           args: [--config-file, pyproject.toml]
-          additional_dependencies: [numpy, pytest, zfpy, 'zarr==3.0.0b1']
+          additional_dependencies: [numpy, pytest, crc32c, zfpy, 'zarr>=3.0.0b2']

{numcodecs-0.14.0 → numcodecs-0.14.1}/.readthedocs.yaml

@@ -9,7 +9,7 @@ build:
     python: "3.12"
   jobs:
     post_install:
-      - python -m pip install --pre 'zarr'
+      - python -m pip install --pre 'zarr>=3.0.0b2'
 
 sphinx:
   configuration: docs/conf.py

{numcodecs-0.14.0/numcodecs.egg-info → numcodecs-0.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: numcodecs
-Version: 0.14.0
+Version: 0.14.1
 Summary: A Python package providing buffer compression and transformation codecs for use in data storage and communication applications.
 Maintainer-email: Alistair Miles <alimanfoo@googlemail.com>
 License: MIT
@@ -27,7 +27,6 @@ Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinx-issues; extra == "docs"
 Requires-Dist: pydata-sphinx-theme; extra == "docs"
 Requires-Dist: numpydoc; extra == "docs"
-Requires-Dist: mock; extra == "docs"
 Provides-Extra: test
 Requires-Dist: coverage; extra == "test"
 Requires-Dist: pytest; extra == "test"

{numcodecs-0.14.0 → numcodecs-0.14.1}/docs/contributing.rst

@@ -1,5 +1,5 @@
-Contributing to NumCodecs
-=========================
+Contributing
+============
 
 NumCodecs is a community maintained project. We welcome contributions in the form of bug
 reports, bug fixes, documentation, enhancement proposals and more. This page provides

{numcodecs-0.14.0 → numcodecs-0.14.1}/docs/release.rst

@@ -6,11 +6,30 @@ Release notes
     # to document your changes. On releases it will be
     # re-indented so that it does not show up in the notes.
 
+    .. _unreleased:
+
+    Unreleased
+    ----------
+
 .. _unreleased:
 
-Unreleased
-----------
+0.14.1
+------
 
+Fixes
+~~~~~
+* Cleanups to the ``crc32c`` soft dependency.
+  Whereas in ``numcodecs`` 0.14.0 a runtime error was raised if
+  the ``CRC32C`` codec used without the ``crc32c`` installed,
+  the ``CRC32C`` codec is no longer defined at import time if
+  ``crc32c`` is not installed. This has been changed to match
+  the behaviour of other optional dependencies/codecs.
+  By :user:`John Kirkham <jakirkham>`, :issue:`637`
+
+Improvements
+~~~~~~~~~~~~
+* Add `noexcept` to `_utils` C-equiv functions
+  By :user:`John Kirkham <jakirkham>`, :issue:`641`.
 
 .. _release_0.14.0:
 

{numcodecs-0.14.0 → numcodecs-0.14.1}/numcodecs/__init__.py

@@ -117,13 +117,17 @@ with suppress(ImportError):
 
     register_codec(MsgPack)
 
-from numcodecs.checksum32 import CRC32, CRC32C, Adler32, JenkinsLookup3
+from numcodecs.checksum32 import CRC32, Adler32, JenkinsLookup3
 
 register_codec(CRC32)
-register_codec(CRC32C)
 register_codec(Adler32)
 register_codec(JenkinsLookup3)
 
+with suppress(ImportError):
+    from numcodecs.checksum32 import CRC32C
+
+    register_codec(CRC32C)
+
 from numcodecs.json import JSON
 
 register_codec(JSON)

{numcodecs-0.14.0 → numcodecs-0.14.1}/numcodecs/_utils.pxd

@@ -8,14 +8,14 @@
 from libc.stdint cimport uint8_t, uint32_t
 
 
-cdef inline void store_le32(uint8_t c[4], uint32_t i) nogil:
+cdef inline void store_le32(uint8_t c[4], uint32_t i) noexcept nogil:
     c[0] = i & 0xFF
     c[1] = (i >> 8) & 0xFF
     c[2] = (i >> 16) & 0xFF
     c[3] = (i >> 24) & 0xFF
 
 
-cdef inline uint32_t load_le32(const uint8_t c[4]) nogil:
+cdef inline uint32_t load_le32(const uint8_t c[4]) noexcept nogil:
     return (
         c[0] |
         (c[1] << 8) |

{numcodecs-0.14.0 → numcodecs-0.14.1}/numcodecs/checksum32.py

@@ -1,7 +1,9 @@
 import struct
 import zlib
 from collections.abc import Callable
-from typing import TYPE_CHECKING, Literal
+from contextlib import suppress
+from types import ModuleType
+from typing import TYPE_CHECKING, Literal, Optional
 
 import numpy as np
 
@@ -9,7 +11,11 @@ from .abc import Codec
 from .compat import ensure_contiguous_ndarray, ndarray_copy
 from .jenkins import jenkins_lookup3
 
-if TYPE_CHECKING:
+_crc32c: Optional[ModuleType] = None
+with suppress(ImportError):
+    import crc32c as _crc32c  # type: ignore[no-redef]
+
+if TYPE_CHECKING:  # pragma: no cover
     from typing_extensions import Buffer
 
 CHECKSUM_LOCATION = Literal['start', 'end']
@@ -76,28 +82,6 @@ class CRC32(Checksum32):
     location = 'start'
 
 
-class CRC32C(Checksum32):
-    """Codec add a crc32c checksum to the buffer.
-
-    Parameters
-    ----------
-    location : 'start' or 'end'
-        Where to place the checksum in the buffer.
-    """
-
-    codec_id = 'crc32c'
-
-    def checksum(self, buf):
-        try:
-            from crc32c import crc32c as crc32c_
-
-            return crc32c_(buf)
-        except ImportError:  # pragma: no cover
-            raise ImportError("crc32c must be installed to use the CRC32C checksum codec.")
-
-    location = 'end'
-
-
 class Adler32(Checksum32):
     """Codec add a adler32 checksum to the buffer.
 
@@ -168,3 +152,19 @@ class JenkinsLookup3(Checksum32):
             out.view("uint8")[:] = b[:-4]
             return out
         return memoryview(b[:-4])
+
+
+if _crc32c:
+
+    class CRC32C(Checksum32):
+        """Codec add a crc32c checksum to the buffer.
+
+        Parameters
+        ----------
+        location : 'start' or 'end'
+            Where to place the checksum in the buffer.
+        """
+
+        codec_id = 'crc32c'
+        checksum = _crc32c.crc32c  # type: ignore[union-attr]
+        location = 'end'

{numcodecs-0.14.0 → numcodecs-0.14.1}/numcodecs/compat_ext.pyx

@@ -12,7 +12,7 @@ from .compat import ensure_contiguous_ndarray
 cdef class Buffer:
     """Convenience class for buffer interface."""
 
-    def __cinit__(self, obj, flags):
+    def __cinit__(self, obj, int flags):
         PyObject_GetBuffer(obj, &(self.buffer), flags)
         self.acquired = True
         self.ptr = <char *> self.buffer.buf

{numcodecs-0.14.0 → numcodecs-0.14.1}/numcodecs/pcodec.py

@@ -1,7 +1,6 @@
 from typing import Literal, Optional
 
-import numcodecs
-import numcodecs.abc
+from numcodecs.abc import Codec
 from numcodecs.compat import ensure_contiguous_ndarray
 
 try:
@@ -13,7 +12,7 @@ except ImportError:  # pragma: no cover
 DEFAULT_MAX_PAGE_N = 262144
 
 
-class PCodec(numcodecs.abc.Codec):
+class PCodec(Codec):
     """
     PCodec (or pco, pronounced "pico") losslessly compresses and decompresses
     numerical sequences with high compression ratio and fast speed.

{numcodecs-0.14.0 → numcodecs-0.14.1}/numcodecs/tests/test_checksum32.py

@@ -1,9 +1,10 @@
 import itertools
+from contextlib import suppress
 
 import numpy as np
 import pytest
 
-from numcodecs.checksum32 import CRC32, CRC32C, Adler32
+from numcodecs.checksum32 import CRC32, Adler32
 from numcodecs.tests.common import (
     check_backwards_compatibility,
     check_config,
@@ -13,6 +14,12 @@ from numcodecs.tests.common import (
     check_repr,
 )
 
+has_crc32c = False
+with suppress(ImportError):
+    from numcodecs.checksum32 import CRC32C
+
+    has_crc32c = True
+
 # mix of dtypes: integer, float, bool, string
 # mix of shapes: 1D, 2D, 3D
 # mix of orders: C, F
@@ -35,11 +42,16 @@ arrays = [
 codecs = [
     CRC32(),
     CRC32(location="end"),
-    CRC32C(location="start"),
-    CRC32C(),
     Adler32(),
     Adler32(location="end"),
 ]
+if has_crc32c:
+    codecs.extend(
+        [
+            CRC32C(location="start"),
+            CRC32C(),
+        ]
+    )
 
 
 @pytest.mark.parametrize(("codec", "arr"), itertools.product(codecs, arrays))
@@ -84,25 +96,28 @@ def test_err_encode_list(codec):
 def test_err_location():
     with pytest.raises(ValueError):
         CRC32(location="foo")
-    with pytest.raises(ValueError):
-        CRC32C(location="foo")
     with pytest.raises(ValueError):
         Adler32(location="foo")
+    if has_crc32c:
+        with pytest.raises(ValueError):
+            CRC32C(location="foo")
 
 
 def test_repr():
     check_repr("CRC32(location='start')")
-    check_repr("CRC32C(location='start')")
-    check_repr("Adler32(location='start')")
     check_repr("CRC32(location='end')")
-    check_repr("CRC32C(location='end')")
+    check_repr("Adler32(location='start')")
     check_repr("Adler32(location='end')")
+    if has_crc32c:
+        check_repr("CRC32C(location='start')")
+        check_repr("CRC32C(location='end')")
 
 
 def test_backwards_compatibility():
     check_backwards_compatibility(CRC32.codec_id, arrays, [CRC32()])
     check_backwards_compatibility(Adler32.codec_id, arrays, [Adler32()])
-    check_backwards_compatibility(CRC32C.codec_id, arrays, [CRC32C()])
+    if has_crc32c:
+        check_backwards_compatibility(CRC32C.codec_id, arrays, [CRC32C()])
 
 
 @pytest.mark.parametrize("codec", codecs)
@@ -123,6 +138,7 @@ def test_err_out_too_small(codec):
         codec.decode(codec.encode(arr), out)
 
 
+@pytest.mark.skipif(not has_crc32c, reason="Needs `crc32c` installed")
 def test_crc32c_checksum():
     arr = np.arange(0, 64, dtype="uint8")
     buf = CRC32C(location="end").encode(arr)

{numcodecs-0.14.0 → numcodecs-0.14.1}/numcodecs/tests/test_zarr3.py

@@ -5,10 +5,10 @@ from typing import TYPE_CHECKING
 import numpy as np
 import pytest
 
-if not TYPE_CHECKING:
-    zarr = pytest.importorskip("zarr")
-else:
+if TYPE_CHECKING:  # pragma: no cover
     import zarr
+else:
+    zarr = pytest.importorskip("zarr")
 
 import zarr.storage
 from zarr.core.common import JSON
@@ -36,7 +36,7 @@ EXPECTED_WARNING_STR = "Numcodecs codecs are not in the Zarr version 3.*"
 
 @pytest.fixture
 def store() -> StorePath:
-    return StorePath(MemoryStore(mode="w"))
+    return StorePath(MemoryStore(read_only=False))
 
 
 ALL_CODECS = [getattr(numcodecs.zarr3, cls_name) for cls_name in numcodecs.zarr3.__all__]
@@ -50,9 +50,7 @@ def test_entry_points(codec_class: type[numcodecs.zarr3._NumcodecsCodec]):
 
 @pytest.mark.parametrize("codec_class", ALL_CODECS)
 def test_docstring(codec_class: type[numcodecs.zarr3._NumcodecsCodec]):
-    if codec_class.__doc__ is None:
-        pytest.skip()
-    assert "See :class:`numcodecs." in codec_class.__doc__
+    assert "See :class:`numcodecs." in codec_class.__doc__  # type: ignore[operator]
 
 
 @pytest.mark.parametrize(

{numcodecs-0.14.0 → numcodecs-0.14.1}/numcodecs/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.14.0'
-__version_tuple__ = version_tuple = (0, 14, 0)
+__version__ = version = '0.14.1'
+__version_tuple__ = version_tuple = (0, 14, 1)

{numcodecs-0.14.0 → numcodecs-0.14.1/numcodecs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: numcodecs
-Version: 0.14.0
+Version: 0.14.1
 Summary: A Python package providing buffer compression and transformation codecs for use in data storage and communication applications.
 Maintainer-email: Alistair Miles <alimanfoo@googlemail.com>
 License: MIT
@@ -27,7 +27,6 @@ Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinx-issues; extra == "docs"
 Requires-Dist: pydata-sphinx-theme; extra == "docs"
 Requires-Dist: numpydoc; extra == "docs"
-Requires-Dist: mock; extra == "docs"
 Provides-Extra: test
 Requires-Dist: coverage; extra == "test"
 Requires-Dist: pytest; extra == "test"

{numcodecs-0.14.0 → numcodecs-0.14.1}/numcodecs.egg-info/requires.txt

@@ -8,7 +8,6 @@ sphinx
 sphinx-issues
 pydata-sphinx-theme
 numpydoc
-mock
 
 [msgpack]
 msgpack

{numcodecs-0.14.0 → numcodecs-0.14.1}/pyproject.toml

@@ -50,7 +50,6 @@ docs = [
     "sphinx-issues",
     "pydata-sphinx-theme",
     "numpydoc",
-    "mock",
 ]
 test = [
     "coverage",