Merge branch 'main' into typing

Author: dstansby

.github/workflows/ci.yaml

@@ -50,8 +50,7 @@ jobs:
       - name: Install numcodecs
         run: |
           export DISABLE_NUMCODECS_AVX2=""
-          # TODO: put back zfpy import when it supports numpy 2.0
-          python -m pip install -v -e .[test,test_extras,msgpack,crc32c,pcodec]
+          python -m pip install -v -e .[test,test_extras,msgpack,crc32c,pcodec,zfpy]
 
       - name: Install zarr-python
         # Since zarr v3 requires numpy >= 1.25, on Python 3.11 leave it out
@@ -60,11 +59,6 @@ jobs:
         # TODO: remove --pre option when zarr v3 is out
         run: 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
-        if: matrix.python-version == '3.11'
-        run: python -m pip install -v ".[zfpy]"
-
       - name: List installed packages
         run: python -m pip list
 

numcodecs/delta.py

@@ -63,12 +63,7 @@ def encode(self, buf):
         enc[0] = arr[0]
 
         # compute differences
-        # using np.subtract for in-place operations
-        if arr.dtype == bool:
-            np.not_equal(arr[1:], arr[:-1], out=enc[1:])
-        else:
-            np.subtract(arr[1:], arr[:-1], out=enc[1:])
-
+        enc[1:] = np.diff(arr)
         return enc
 
     def decode(self, buf, out=None):

numcodecs/tests/test_vlen_bytes.py

@@ -84,6 +84,9 @@ def test_decode_errors():
         codec.decode(enc, out=np.zeros(10, dtype='i4'))
 
 
+# TODO: fix this test on GitHub actions somehow...
+# See https://github.com/zarr-developers/numcodecs/issues/683
+@pytest.mark.skip("Test is failing on GitHub actions.")
 def test_encode_none():
     a = np.array([b'foo', None, b'bar'], dtype=object)
     codec = VLenBytes()