Remove shim

Author: maxrjones

src/zarr/core/chunk_grids.py

@@ -752,34 +752,3 @@ def _auto_partition(
             _shards_out = cast("tuple[int, ...]", shard_shape)
 
     return _shards_out, _chunks_out
-
-
-class _RegularChunkGridMeta(type):
-    """Metaclass that makes ``isinstance(obj, RegularChunkGrid)`` work.
-
-    Returns True when *obj* is a ``ChunkGrid`` whose ``is_regular`` flag is set.
-    """
-
-    def __instancecheck__(cls, instance: object) -> bool:
-        return isinstance(instance, ChunkGrid) and instance.is_regular
-
-
-class RegularChunkGrid(metaclass=_RegularChunkGridMeta):
-    """Deprecated compatibility shim.
-
-    .. deprecated:: 3.1
-        Use ``ChunkGrid.from_sizes(array_shape, chunk_sizes)`` instead.
-        Use ``grid.is_regular`` instead of ``isinstance(grid, RegularChunkGrid)``.
-    """
-
-    def __new__(cls, *, chunk_shape: ShapeLike) -> ChunkGrid:  # type: ignore[misc]
-        warnings.warn(
-            "RegularChunkGrid is deprecated. "
-            "Use ChunkGrid.from_sizes(array_shape, chunk_sizes) instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        # Without array_shape we cannot bind extents, so use chunk_shape as extent.
-        # This matches the old behavior where RegularChunkGrid was shape-unaware.
-        parsed = parse_shapelike(chunk_shape)
-        return ChunkGrid.from_sizes(array_shape=parsed, chunk_sizes=tuple(parsed))

tests/test_unified_chunk_grid.py

@@ -130,45 +130,6 @@ def test_rectilinear_feature_flag_enabled() -> None:
         assert grid.ndim == 2
 
 
-# ---------------------------------------------------------------------------
-# RegularChunkGrid compatibility tests
-# ---------------------------------------------------------------------------
-
-
-def test_regular_chunk_grid_compat_construction_emits_deprecation_warning() -> None:
-    """Constructing RegularChunkGrid emits a DeprecationWarning and returns a ChunkGrid"""
-    from zarr.core.chunk_grids import RegularChunkGrid
-
-    with pytest.warns(DeprecationWarning, match="RegularChunkGrid is deprecated"):
-        grid = RegularChunkGrid(chunk_shape=(10, 20))
-    assert isinstance(grid, ChunkGrid)
-    assert grid.is_regular
-    assert grid.chunk_shape == (10, 20)
-
-
-@pytest.mark.parametrize(
-    ("grid", "expected"),
-    [
-        (ChunkGrid.from_sizes((100, 200), (10, 20)), True),
-        (ChunkGrid.from_sizes((30, 50), [[10, 20], [25, 25]]), False),
-    ],
-    ids=["regular-is-instance", "rectilinear-is-not-instance"],
-)
-def test_regular_chunk_grid_isinstance(grid: ChunkGrid, expected: bool) -> None:
-    """isinstance check against RegularChunkGrid matches only regular grids"""
-    from zarr.core.chunk_grids import RegularChunkGrid
-
-    assert isinstance(grid, RegularChunkGrid) == expected
-
-
-@pytest.mark.parametrize("obj", ["hello", 42], ids=["string", "int"])
-def test_regular_chunk_grid_isinstance_false_for_unrelated_types(obj: Any) -> None:
-    """Unrelated types are not instances of RegularChunkGrid"""
-    from zarr.core.chunk_grids import RegularChunkGrid
-
-    assert not isinstance(obj, RegularChunkGrid)
-
-
 # ---------------------------------------------------------------------------
 # FixedDimension tests
 # ---------------------------------------------------------------------------