Merge branch 'v3' into array_fixture_fix

src/zarr/codecs/transpose.py

@@ -2,7 +2,7 @@
 
 from collections.abc import Iterable
 from dataclasses import dataclass, replace
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, cast
 
 import numpy as np
 
@@ -14,7 +14,7 @@
 from zarr.common import JSON, ChunkCoordsLike, parse_named_configuration
 
 if TYPE_CHECKING:
-    from typing import TYPE_CHECKING
+    from typing import Any
 
     from typing_extensions import Self
 

src/zarr/group.py

@@ -31,7 +31,7 @@
 
 if TYPE_CHECKING:
     from collections.abc import AsyncGenerator, Iterable
-    from typing import Any, Literal
+    from typing import Any
 
 logger = logging.getLogger("zarr.group")
 

src/zarr/indexing.py

@@ -1036,7 +1036,7 @@ def __init__(self, selection: CoordinateSelection, shape: ChunkCoords, chunk_gri
         # flatten selection
         selection_broadcast = tuple(dim_sel.reshape(-1) for dim_sel in selection_broadcast)
         chunks_multi_index_broadcast = tuple(
-            [dim_chunks.reshape(-1) for dim_chunks in chunks_multi_index_broadcast]
+            dim_chunks.reshape(-1) for dim_chunks in chunks_multi_index_broadcast
         )
 
         # ravel chunk indices

src/zarr/store/remote.py

@@ -6,15 +6,14 @@
 import fsspec
 
 from zarr.abc.store import Store
-from zarr.buffer import Buffer, BufferPrototype
 from zarr.common import OpenMode
 from zarr.store.core import _dereference_path
 
 if TYPE_CHECKING:
     from fsspec.asyn import AsyncFileSystem
     from upath import UPath
 
-    from zarr.buffer import Buffer
+    from zarr.buffer import Buffer, BufferPrototype
     from zarr.common import BytesLike
 
 

tests/v2/test_indexing.py

@@ -1,4 +1,3 @@
-import numpy
 import numpy as np
 import pytest
 from numpy.testing import assert_array_equal
@@ -1679,7 +1678,7 @@ def test_numpy_int_indexing():
     z = zarr.v2.create(shape=1050, chunks=100, dtype=a.dtype)
     z[:] = a
     assert a[42] == z[42]
-    assert a[numpy.int64(42)] == z[numpy.int64(42)]
+    assert a[np.int64(42)] == z[np.int64(42)]
 
 
 @pytest.mark.parametrize(

tests/v2/test_storage.py

@@ -1070,8 +1070,6 @@ def test_complex(self):
         assert store[self.root + "foo"] == b"hello"
 
     def test_deep_ndim(self):
-        import zarr.v2
-
         store = self.create_store()
         path = None if self.version == 2 else "group1"
         foo = zarr.v2.open_group(store=store, path=path)

tests/v2/test_sync.py

@@ -43,19 +43,17 @@ def init_attributes(self, store, read_only=False, cache=True):
 
 def _append(arg):
     z, i = arg
-    import numpy
 
-    x = numpy.empty(1000, dtype="i4")
+    x = np.empty(1000, dtype="i4")
     x[:] = i
     shape = z.append(x)
     return shape
 
 
 def _set_arange(arg):
     z, i = arg
-    import numpy
 
-    x = numpy.arange(i * 1000, (i * 1000) + 1000, 1)
+    x = np.arange(i * 1000, (i * 1000) + 1000, 1)
     z[i * 1000 : (i * 1000) + 1000] = x
     return i