Merge branch 'main' into feat/memory-store-registry

Author: d-v-b

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ default_language_version:
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.14
+    rev: v0.15.4
     hooks:
       - id: ruff-check
         args: ["--fix", "--show-fixes"]
@@ -47,7 +47,7 @@ repos:
           - hypothesis
           - s3fs
   - repo: https://github.com/scientific-python/cookie
-    rev: 2025.11.21
+    rev: 2026.03.02
     hooks:
       - id: sp-repo-review
   - repo: https://github.com/pre-commit/pygrep-hooks

changes/3710.bugfix.md

@@ -0,0 +1 @@
+Add a dedicated in-memory cache for byte-range requests to the experimental `CacheStore`.

src/zarr/_cli/cli.py

@@ -1,5 +1,5 @@
 import logging
-from enum import Enum
+from enum import StrEnum
 from typing import Annotated, Literal, cast
 
 import typer
@@ -24,12 +24,12 @@ def _set_logging_level(*, verbose: bool) -> None:
     zarr.set_format("%(message)s")
 
 
-class CLIZarrFormat(str, Enum):
+class CLIZarrFormat(StrEnum):
     v2 = "v2"
     v3 = "v3"
 
 
-class CLIZarrFormatV3(str, Enum):
+class CLIZarrFormatV3(StrEnum):
     """Limit CLI choice to only v3"""
 
     v3 = "v3"

src/zarr/abc/store.py

@@ -19,7 +19,7 @@
 __all__ = ["ByteGetter", "ByteSetter", "Store", "set_or_delete"]
 
 
-@dataclass
+@dataclass(frozen=True, slots=True)
 class RangeByteRequest:
     """Request a specific byte range"""
 
@@ -29,15 +29,15 @@ class RangeByteRequest:
     """The end of the byte range request (exclusive)."""
 
 
-@dataclass
+@dataclass(frozen=True, slots=True)
 class OffsetByteRequest:
     """Request all bytes starting from a given byte offset"""
 
     offset: int
     """The byte offset for the offset range request."""
 
 
-@dataclass
+@dataclass(frozen=True, slots=True)
 class SuffixByteRequest:
     """Request up to the last `n` bytes"""
 

src/zarr/core/chunk_key_encodings.py

@@ -42,7 +42,7 @@ class ChunkKeyEncoding(ABC, Metadata):
     @classmethod
     def from_dict(cls, data: dict[str, JSON]) -> Self:
         _, config_parsed = parse_named_configuration(data, require_configuration=False)
-        return cls(**config_parsed if config_parsed else {})
+        return cls(**config_parsed or {})
 
     def to_dict(self) -> dict[str, JSON]:
         return {"name": self.name, "configuration": super().to_dict()}

src/zarr/core/dtype/__init__.py

@@ -81,7 +81,6 @@
     "TBaseDType",
     "TBaseScalar",
     "TimeDelta64",
-    "TimeDelta64",
     "TimeDelta64JSON_V2",
     "TimeDelta64JSON_V3",
     "UInt8",

src/zarr/core/indexing.py

@@ -209,7 +209,7 @@ def _iter_regions(
     # ((slice(0, 1, 1), slice(0, 2, 1)), (slice(1, 2, 1), slice(0, 2, 1)))
     ```
     """
-    grid_shape = tuple(ceildiv(d, s) for d, s in zip(domain_shape, region_shape, strict=True))
+    grid_shape = tuple(itertools.starmap(ceildiv, zip(domain_shape, region_shape, strict=True)))
     for grid_position in _iter_grid(
         grid_shape=grid_shape, origin=origin, selection_shape=selection_shape, order=order
     ):

src/zarr/dtype.py

@@ -72,7 +72,6 @@
     "StructuredJSON_V2",
     "StructuredJSON_V3",
     "TimeDelta64",
-    "TimeDelta64",
     "TimeDelta64JSON_V2",
     "TimeDelta64JSON_V3",
     "UInt8",
@@ -85,6 +84,5 @@
     "VariableLengthUTF8JSON_V2",
     "ZDType",
     "data_type_registry",
-    "data_type_registry",
     "parse_dtype",
 ]