diff --git a/pyproject.toml b/pyproject.toml index 947bec9369..4bcbfd0a0a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -201,34 +201,30 @@ disallow_incomplete_defs = true disallow_untyped_calls = true disallow_untyped_defs = true +no_implicit_reexport = true + [[tool.mypy.overrides]] module = [ "zarr.v2.*", - "zarr.group", - "tests.*", ] -check_untyped_defs = false +ignore_errors = true [[tool.mypy.overrides]] module = [ - "zarr.v2.*", - "zarr.array_v2", + "zarr.group", + "tests.*", ] -disallow_any_generics = false +check_untyped_defs = false [[tool.mypy.overrides]] module = [ - "zarr.v2.*", - "zarr.array_v2", "zarr.group" ] disallow_incomplete_defs = false [[tool.mypy.overrides]] module = [ - "zarr.v2.*", - "zarr.array_v2", "zarr.array", "zarr.buffer" ] @@ -236,13 +232,12 @@ disallow_untyped_calls = false [[tool.mypy.overrides]] module = [ - "zarr.v2.*", - "zarr.array_v2", "zarr.array", "zarr.group", ] disallow_untyped_defs = false + [tool.pytest.ini_options] minversion = "7" testpaths = ["tests"] diff --git a/src/zarr/array.py b/src/zarr/array.py index 7da39c285e..cb780bb8d7 100644 --- a/src/zarr/array.py +++ b/src/zarr/array.py @@ -34,9 +34,9 @@ ZarrFormat, concurrent_map, ) -from zarr.config import config +from zarr.config import config, parse_indexing_order from zarr.indexing import BasicIndexer -from zarr.metadata import ArrayMetadata, ArrayV2Metadata, ArrayV3Metadata, parse_indexing_order +from zarr.metadata import ArrayMetadata, ArrayV2Metadata, ArrayV3Metadata from zarr.store import StoreLike, StorePath, make_store_path from zarr.sync import sync diff --git a/src/zarr/codecs/__init__.py b/src/zarr/codecs/__init__.py index 0f0ff55df5..3ef3a87db7 100644 --- a/src/zarr/codecs/__init__.py +++ b/src/zarr/codecs/__init__.py @@ -1,10 +1,25 @@ from __future__ import annotations -from zarr.codecs.blosc import BloscCname, BloscCodec, BloscShuffle # noqa: F401 -from zarr.codecs.bytes import BytesCodec, Endian # noqa: F401 -from zarr.codecs.crc32c_ import Crc32cCodec # noqa: F401 -from zarr.codecs.gzip import GzipCodec # noqa: F401 -from zarr.codecs.pipeline import BatchedCodecPipeline # noqa: F401 -from zarr.codecs.sharding import ShardingCodec, ShardingCodecIndexLocation # noqa: F401 -from zarr.codecs.transpose import TransposeCodec # noqa: F401 -from zarr.codecs.zstd import ZstdCodec # noqa: F401 +from zarr.codecs.blosc import BloscCname, BloscCodec, BloscShuffle +from zarr.codecs.bytes import BytesCodec, Endian +from zarr.codecs.crc32c_ import Crc32cCodec +from zarr.codecs.gzip import GzipCodec +from zarr.codecs.pipeline import BatchedCodecPipeline +from zarr.codecs.sharding import ShardingCodec, ShardingCodecIndexLocation +from zarr.codecs.transpose import TransposeCodec +from zarr.codecs.zstd import ZstdCodec + +__all__ = [ + "BatchedCodecPipeline", + "BloscCodec", + "BloscCname", + "BloscShuffle", + "BytesCodec", + "Endian", + "Crc32cCodec", + "GzipCodec", + "ShardingCodec", + "ShardingCodecIndexLocation", + "TransposeCodec", + "ZstdCodec", +] diff --git a/src/zarr/codecs/pipeline.py b/src/zarr/codecs/pipeline.py index 893cbc8b4b..6f493c9e81 100644 --- a/src/zarr/codecs/pipeline.py +++ b/src/zarr/codecs/pipeline.py @@ -11,12 +11,11 @@ ArrayBytesCodec, ArrayBytesCodecPartialDecodeMixin, ArrayBytesCodecPartialEncodeMixin, - ByteGetter, BytesBytesCodec, - ByteSetter, Codec, CodecPipeline, ) +from zarr.abc.store import ByteGetter, ByteSetter from zarr.buffer import Buffer, NDBuffer from zarr.codecs.registry import get_codec_class from zarr.common import JSON, concurrent_map, parse_named_configuration diff --git a/src/zarr/codecs/sharding.py b/src/zarr/codecs/sharding.py index a68577be68..ec5306ee80 100644 --- a/src/zarr/codecs/sharding.py +++ b/src/zarr/codecs/sharding.py @@ -14,11 +14,10 @@ ArrayBytesCodec, ArrayBytesCodecPartialDecodeMixin, ArrayBytesCodecPartialEncodeMixin, - ByteGetter, - ByteSetter, Codec, CodecPipeline, ) +from zarr.abc.store import ByteGetter, ByteSetter from zarr.buffer import Buffer, NDBuffer from zarr.chunk_grids import RegularChunkGrid from zarr.codecs.bytes import BytesCodec diff --git a/src/zarr/metadata.py b/src/zarr/metadata.py index 58cc276c29..2d8a455152 100644 --- a/src/zarr/metadata.py +++ b/src/zarr/metadata.py @@ -41,6 +41,9 @@ _bool = bool +__all__ = ["ArrayMetadata"] + + class DataType(Enum): bool = "bool" int8 = "int8" diff --git a/src/zarr/store/__init__.py b/src/zarr/store/__init__.py index b1c3a5f720..b7cd6cc0fd 100644 --- a/src/zarr/store/__init__.py +++ b/src/zarr/store/__init__.py @@ -3,3 +3,5 @@ from zarr.store.remote import RemoteStore from zarr.store.local import LocalStore from zarr.store.memory import MemoryStore + +__all__ = ["StorePath", "StoreLike", "make_store_path", "RemoteStore", "LocalStore", "MemoryStore"]