Bump to v0.2.13 with leb128

Author: juntyr

pyproject.toml

@@ -4,16 +4,16 @@ build-backend = "hatchling.build"
 
 [project]
 name = "numcodecs-combinators"
-version = "0.2.12"
+version = "0.2.13"
 description = "Combinator codecs for the `numcodecs` buffer compression API"
 readme = "README.md"
 license = "MPL-2.0"
 requires-python = ">=3.10"
 dependencies = [
+    "leb128~=1.0.8",
     "numcodecs>=0.13.0,<0.17",
     "numpy~=2.0",
     "typing-extensions~=4.6",
-    "varint~=1.0.2",
 ]
 optional-dependencies.xarray = [ "xarray>=2024.06", "dask>=2024.6" ]
 
@@ -39,5 +39,5 @@ addopts = ["--import-mode=importlib"]
 xfail_strict = true
 
 [[tool.mypy.overrides]]
-module = ["numcodecs.*", "varint.*"]
+module = ["leb128.*", "numcodecs.*"]
 follow_untyped_imports = true

src/numcodecs_combinators/best.py

@@ -7,11 +7,11 @@
 from io import BytesIO
 from typing import Callable, Optional
 
+import leb128
 import numcodecs
 import numcodecs.compat
 import numcodecs.registry
 import numpy as np
-import varint
 from numcodecs.abc import Codec
 from typing_extensions import Buffer, Self  # MSPV 3.12
 
@@ -90,7 +90,7 @@ def encode(self, buf: Buffer) -> bytes:
                 best_index = i
                 best_encoded = encoded
 
-        encoded_index = varint.encode(best_index)
+        encoded_index = leb128.u.encode(best_index)
         encoded_bytes = numcodecs.compat.ensure_bytes(best_encoded)
 
         if len(self) == 1:
@@ -126,7 +126,7 @@ def decode(self, buf: Buffer, out: Optional[Buffer] = None) -> Buffer:
         if len(self) == 1:
             best_index = 0
         else:
-            best_index = varint.decode_stream(b_io)
+            best_index = leb128.u.decode_reader(b_io)
 
         return self[best_index].decode(b_io.read(), out=out)
 

src/numcodecs_combinators/framed.py

@@ -7,11 +7,11 @@
 from io import BytesIO
 from typing import Callable, Optional
 
+import leb128
 import numcodecs
 import numcodecs.compat
 import numcodecs.registry
 import numpy as np
-import varint
 from numcodecs.abc import Codec
 from typing_extensions import Buffer, Self  # MSPV 3.12
 
@@ -97,15 +97,15 @@ def encode(self, buf: Buffer) -> bytes:
             encoded_ndarray.dtype.newbyteorder("<")
         ).tobytes()
 
-        message = [varint.encode(len(frames))]
+        message = [leb128.u.encode(len(frames))]
 
         for dtype, shape in frames:
-            message.append(varint.encode(len(dtype.str)))
+            message.append(leb128.u.encode(len(dtype.str)))
             message.append(dtype.str.encode("ascii"))
 
-            message.append(varint.encode(len(shape)))
+            message.append(leb128.u.encode(len(shape)))
             for s in shape:
-                message.append(varint.encode(s))
+                message.append(leb128.u.encode(s))
 
         message.append(encoded_bytes)
 
@@ -136,16 +136,17 @@ def decode(self, buf: Buffer, out: Optional[Buffer] = None) -> Buffer:
 
         b_io = BytesIO(b)
 
-        n_frames = varint.decode_stream(b_io)
+        n_frames = leb128.u.decode_reader(b_io)
         assert n_frames == len(self) + 1, (
             f"encoded data must contain {len(self) + 1} frames, found {n_frames}"
         )
 
         frames = []
         for _ in range(n_frames):
-            dtype = np.dtype(b_io.read(varint.decode_stream(b_io)).decode("ascii"))
+            dtype = np.dtype(b_io.read(leb128.u.decode_reader(b_io)).decode("ascii"))
             shape = tuple(
-                varint.decode_stream(b_io) for _ in range(varint.decode_stream(b_io))
+                leb128.u.decode_reader(b_io)
+                for _ in range(leb128.u.decode_reader(b_io))
             )
             frames.append((dtype, shape))