From 966ba41b8f043dd724c269dcc79f9ad87cdfafe9 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 19 Jul 2024 18:21:06 +0100 Subject: [PATCH] Make zarr.array private (> zarr._array) --- src/zarr/__init__.py | 2 +- src/zarr/{array.py => _array.py} | 0 src/zarr/api/asynchronous.py | 2 +- src/zarr/api/synchronous.py | 2 +- src/zarr/attributes.py | 2 +- src/zarr/group.py | 2 +- src/zarr/indexing.py | 2 +- tests/v3/test_array.py | 2 +- tests/v3/test_buffer.py | 9 +++++++-- tests/v3/test_codecs/test_blosc.py | 2 +- tests/v3/test_codecs/test_codecs.py | 2 +- tests/v3/test_codecs/test_endian.py | 2 +- tests/v3/test_codecs/test_gzip.py | 2 +- tests/v3/test_codecs/test_sharding.py | 2 +- tests/v3/test_codecs/test_transpose.py | 2 +- tests/v3/test_codecs/test_zstd.py | 2 +- tests/v3/test_group.py | 2 +- tests/v3/test_v2.py | 2 +- 18 files changed, 23 insertions(+), 18 deletions(-) rename src/zarr/{array.py => _array.py} (100%) diff --git a/src/zarr/__init__.py b/src/zarr/__init__.py index 227b0cf63..4a00bffbc 100644 --- a/src/zarr/__init__.py +++ b/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 diff --git a/src/zarr/array.py b/src/zarr/_array.py similarity index 100% rename from src/zarr/array.py rename to src/zarr/_array.py diff --git a/src/zarr/api/asynchronous.py b/src/zarr/api/asynchronous.py index 5d2e54baa..6bfaff124 100644 --- a/src/zarr/api/asynchronous.py +++ b/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 diff --git a/src/zarr/api/synchronous.py b/src/zarr/api/synchronous.py index eef87aab7..8a62300ce 100644 --- a/src/zarr/api/synchronous.py +++ b/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 diff --git a/src/zarr/attributes.py b/src/zarr/attributes.py index 079ae38a3..ad97cb62c 100644 --- a/src/zarr/attributes.py +++ b/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 diff --git a/src/zarr/group.py b/src/zarr/group.py index 432ebc460..a7365b652 100644 --- a/src/zarr/group.py +++ b/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 diff --git a/src/zarr/indexing.py b/src/zarr/indexing.py index 6987f69c1..1990bbf1b 100644 --- a/src/zarr/indexing.py +++ b/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] diff --git a/tests/v3/test_array.py b/tests/v3/test_array.py index 9fd135ad5..1b8f3a136 100644 --- a/tests/v3/test_array.py +++ b/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 diff --git a/tests/v3/test_buffer.py b/tests/v3/test_buffer.py index d53e98d42..d6529e101 100644 --- a/tests/v3/test_buffer.py +++ b/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 diff --git a/tests/v3/test_codecs/test_blosc.py b/tests/v3/test_codecs/test_blosc.py index 33ca9eba7..814db11a5 100644 --- a/tests/v3/test_codecs/test_blosc.py +++ b/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 diff --git a/tests/v3/test_codecs/test_codecs.py b/tests/v3/test_codecs/test_codecs.py index a2b459f60..aa7b641ec 100644 --- a/tests/v3/test_codecs/test_codecs.py +++ b/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, diff --git a/tests/v3/test_codecs/test_endian.py b/tests/v3/test_codecs/test_endian.py index 6f3e1c948..a9ebbf700 100644 --- a/tests/v3/test_codecs/test_endian.py +++ b/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 diff --git a/tests/v3/test_codecs/test_gzip.py b/tests/v3/test_codecs/test_gzip.py index f982bacb8..3d33d885f 100644 --- a/tests/v3/test_codecs/test_gzip.py +++ b/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 diff --git a/tests/v3/test_codecs/test_sharding.py b/tests/v3/test_codecs/test_sharding.py index 27667ca9d..ed338f0ec 100644 --- a/tests/v3/test_codecs/test_sharding.py +++ b/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, diff --git a/tests/v3/test_codecs/test_transpose.py b/tests/v3/test_codecs/test_transpose.py index bea743512..f92fd4051 100644 --- a/tests/v3/test_codecs/test_transpose.py +++ b/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 diff --git a/tests/v3/test_codecs/test_zstd.py b/tests/v3/test_codecs/test_zstd.py index 1e1b1e02c..8b8b71842 100644 --- a/tests/v3/test_codecs/test_zstd.py +++ b/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 diff --git a/tests/v3/test_group.py b/tests/v3/test_group.py index daa5979b2..9ff5d62e8 100644 --- a/tests/v3/test_group.py +++ b/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 diff --git a/tests/v3/test_v2.py b/tests/v3/test_v2.py index 7a7d72806..4f4dc5aed 100644 --- a/tests/v3/test_v2.py +++ b/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