diff --git a/src/zarr/codecs/__init__.py b/src/zarr/codecs/__init__.py index dc6c3f9154..e407d94892 100644 --- a/src/zarr/codecs/__init__.py +++ b/src/zarr/codecs/__init__.py @@ -9,7 +9,6 @@ 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.vlen_utf8 import VLenBytesCodec, VLenUTF8Codec @@ -17,7 +16,6 @@ from zarr.core.metadata.v3 import DataType __all__ = [ - "BatchedCodecPipeline", "BloscCname", "BloscCodec", "BloscShuffle", diff --git a/src/zarr/codecs/registry.py b/src/zarr/codecs/registry.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/zarr/core/__init__.py b/src/zarr/core/__init__.py index e69de29bb2..cbacfe3422 100644 --- a/src/zarr/core/__init__.py +++ b/src/zarr/core/__init__.py @@ -0,0 +1,4 @@ +from __future__ import annotations + +from zarr.core.buffer import Buffer, NDBuffer # noqa: F401 +from zarr.core.codec_pipeline import BatchedCodecPipeline # noqa: F401 diff --git a/src/zarr/codecs/pipeline.py b/src/zarr/core/codec_pipeline.py similarity index 100% rename from src/zarr/codecs/pipeline.py rename to src/zarr/core/codec_pipeline.py diff --git a/src/zarr/core/config.py b/src/zarr/core/config.py index ec2c8c47a3..29f5e139fe 100644 --- a/src/zarr/core/config.py +++ b/src/zarr/core/config.py @@ -47,7 +47,7 @@ def reset(self) -> None: "threading": {"max_workers": None}, "json_indent": 2, "codec_pipeline": { - "path": "zarr.codecs.pipeline.BatchedCodecPipeline", + "path": "zarr.core.codec_pipeline.BatchedCodecPipeline", "batch_size": 1, }, "codecs": { diff --git a/tests/test_config.py b/tests/test_config.py index c4cf794c5f..ddabffb467 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -11,9 +11,10 @@ from zarr import Array, zeros from zarr.abc.codec import CodecInput, CodecOutput, CodecPipeline from zarr.abc.store import ByteSetter, Store -from zarr.codecs import BatchedCodecPipeline, BloscCodec, BytesCodec, Crc32cCodec, ShardingCodec +from zarr.codecs import BloscCodec, BytesCodec, Crc32cCodec, ShardingCodec from zarr.core.array_spec import ArraySpec from zarr.core.buffer import NDBuffer +from zarr.core.codec_pipeline import BatchedCodecPipeline from zarr.core.config import BadConfigError, config from zarr.core.indexing import SelectorTuple from zarr.registry import ( @@ -45,7 +46,7 @@ def test_config_defaults_set() -> None: "threading": {"max_workers": None}, "json_indent": 2, "codec_pipeline": { - "path": "zarr.codecs.pipeline.BatchedCodecPipeline", + "path": "zarr.core.codec_pipeline.BatchedCodecPipeline", "batch_size": 1, }, "buffer": "zarr.core.buffer.cpu.Buffer", @@ -96,8 +97,8 @@ def test_config_codec_pipeline_class(store: Store) -> None: # has default value assert get_pipeline_class().__name__ != "" - config.set({"codec_pipeline.name": "zarr.codecs.pipeline.BatchedCodecPipeline"}) - assert get_pipeline_class() == zarr.codecs.pipeline.BatchedCodecPipeline + config.set({"codec_pipeline.name": "zarr.core.codec_pipeline.BatchedCodecPipeline"}) + assert get_pipeline_class() == zarr.core.codec_pipeline.BatchedCodecPipeline _mock = Mock()