Make zarr.array private (> zarr._array)

src/zarr/__init__.py

@@ -1,3 +1,4 @@
+from zarr._array import Array, AsyncArray
 from zarr._version import version as __version__
 from zarr.api.synchronous import (
     array,
@@ -26,7 +27,6 @@
     zeros,
     zeros_like,
 )
-from zarr.array import Array, AsyncArray
 from zarr.config import config
 from zarr.group import AsyncGroup, Group
 

src/zarr/api/asynchronous.py

@@ -8,8 +8,8 @@
 import numpy as np
 import numpy.typing as npt
 
+from zarr._array import Array, AsyncArray
 from zarr.abc.codec import Codec
-from zarr.array import Array, AsyncArray
 from zarr.buffer import NDArrayLike
 from zarr.chunk_key_encodings import ChunkKeyEncoding
 from zarr.common import JSON, AccessModeLiteral, ChunkCoords, MemoryOrder, ZarrFormat

src/zarr/api/synchronous.py

@@ -3,7 +3,7 @@
 from typing import Any
 
 import zarr.api.asynchronous as async_api
-from zarr.array import Array, AsyncArray
+from zarr._array import Array, AsyncArray
 from zarr.buffer import NDArrayLike
 from zarr.common import JSON, AccessModeLiteral, ChunkCoords, ZarrFormat
 from zarr.group import Group

src/zarr/attributes.py

@@ -6,7 +6,7 @@
 from zarr.common import JSON
 
 if TYPE_CHECKING:
-    from zarr.array import Array
+    from zarr._array import Array
     from zarr.group import Group
 
 

src/zarr/group.py

@@ -10,10 +10,10 @@
 import numpy.typing as npt
 from typing_extensions import deprecated
 
+from zarr._array import Array, AsyncArray
 from zarr.abc.codec import Codec
 from zarr.abc.metadata import Metadata
 from zarr.abc.store import set_or_delete
-from zarr.array import Array, AsyncArray
 from zarr.attributes import Attributes
 from zarr.buffer import Buffer, BufferPrototype, default_buffer_prototype
 from zarr.chunk_key_encodings import ChunkKeyEncoding

src/zarr/indexing.py

@@ -27,7 +27,7 @@
 from zarr.common import ChunkCoords, product
 
 if TYPE_CHECKING:
-    from zarr.array import Array
+    from zarr._array import Array
     from zarr.chunk_grids import ChunkGrid
 
 IntSequence = list[int] | npt.NDArray[np.intp]

tests/v3/test_array.py

@@ -3,7 +3,7 @@
 import numpy as np
 import pytest
 
-from zarr.array import Array
+from zarr import Array
 from zarr.common import ZarrFormat
 from zarr.errors import ContainsArrayError, ContainsGroupError
 from zarr.group import Group

tests/v3/test_buffer.py

@@ -3,8 +3,13 @@
 import numpy as np
 import pytest
 
-from zarr.array import AsyncArray
-from zarr.buffer import ArrayLike, BufferPrototype, NDArrayLike, numpy_buffer_prototype
+from zarr import AsyncArray
+from zarr.buffer import (
+    ArrayLike,
+    BufferPrototype,
+    NDArrayLike,
+    numpy_buffer_prototype,
+)
 from zarr.codecs.blosc import BloscCodec
 from zarr.codecs.bytes import BytesCodec
 from zarr.codecs.crc32c_ import Crc32cCodec

tests/v3/test_codecs/test_blosc.py

@@ -3,8 +3,8 @@
 import numpy as np
 import pytest
 
+from zarr import AsyncArray
 from zarr.abc.store import Store
-from zarr.array import AsyncArray
 from zarr.buffer import default_buffer_prototype
 from zarr.codecs import BloscCodec, BytesCodec, ShardingCodec
 from zarr.store.core import StorePath

tests/v3/test_codecs/test_codecs.py

@@ -7,9 +7,9 @@
 import pytest
 
 import zarr.v2
+from zarr import Array, AsyncArray
 from zarr.abc.codec import Codec
 from zarr.abc.store import Store
-from zarr.array import Array, AsyncArray
 from zarr.buffer import default_buffer_prototype
 from zarr.codecs import (
     BytesCodec,

tests/v3/test_codecs/test_endian.py

@@ -4,8 +4,8 @@
 import pytest
 
 import zarr.v2
+from zarr import AsyncArray
 from zarr.abc.store import Store
-from zarr.array import AsyncArray
 from zarr.buffer import default_buffer_prototype
 from zarr.codecs import BytesCodec
 from zarr.store.core import StorePath

tests/v3/test_codecs/test_gzip.py

@@ -1,8 +1,8 @@
 import numpy as np
 import pytest
 
+from zarr import Array
 from zarr.abc.store import Store
-from zarr.array import Array
 from zarr.codecs import BytesCodec, GzipCodec
 from zarr.store.core import StorePath
 

tests/v3/test_codecs/test_sharding.py

@@ -3,8 +3,8 @@
 import numpy as np
 import pytest
 
+from zarr import Array, AsyncArray
 from zarr.abc.store import Store
-from zarr.array import Array, AsyncArray
 from zarr.buffer import default_buffer_prototype
 from zarr.codecs import (
     BloscCodec,

tests/v3/test_codecs/test_transpose.py

@@ -2,9 +2,9 @@
 import pytest
 
 import zarr.v2
+from zarr import Array, AsyncArray
 from zarr.abc.codec import Codec
 from zarr.abc.store import Store
-from zarr.array import Array, AsyncArray
 from zarr.buffer import default_buffer_prototype
 from zarr.codecs import BytesCodec, ShardingCodec, TransposeCodec
 from zarr.common import MemoryOrder

tests/v3/test_codecs/test_zstd.py

@@ -1,8 +1,8 @@
 import numpy as np
 import pytest
 
+from zarr import Array
 from zarr.abc.store import Store
-from zarr.array import Array
 from zarr.codecs import BytesCodec, ZstdCodec
 from zarr.store.core import StorePath
 

tests/v3/test_group.py

@@ -6,7 +6,7 @@
 import pytest
 from _pytest.compat import LEGACY_PATH
 
-from zarr.array import Array, AsyncArray
+from zarr import Array, AsyncArray
 from zarr.buffer import Buffer
 from zarr.common import ZarrFormat
 from zarr.errors import ContainsArrayError, ContainsGroupError

tests/v3/test_v2.py

@@ -3,8 +3,8 @@
 import numpy as np
 import pytest
 
+from zarr import Array
 from zarr.abc.store import Store
-from zarr.array import Array
 from zarr.store import MemoryStore, StorePath