lint

Author: d-v-b

src/zarr/codecs/blosc.py

@@ -14,13 +14,12 @@
     overload,
 )
 
-from typing_extensions import ReadOnly
-
 import numcodecs
 from numcodecs.blosc import Blosc
 from packaging.version import Version
+from typing_extensions import ReadOnly
 
-from zarr.abc.codec import BytesBytesCodec, CodecJSON, CodecJSON_V2
+from zarr.abc.codec import BytesBytesCodec, CodecJSON
 from zarr.core.buffer.cpu import as_numpy_array_wrapper
 from zarr.core.common import (
     JSON,
@@ -64,8 +63,10 @@ class BloscJSON_V2(BloscConfigV2):
     """
     The JSON form of the Blosc codec in Zarr V2.
     """
+
     id: ReadOnly[Literal["blosc"]]
 
+
 class BloscJSON_V3(NamedRequiredConfig[Literal["blosc"], BloscConfigV3]):
     """
     The JSON form of the Blosc codec in Zarr V3.

src/zarr/codecs/bytes.py

@@ -45,6 +45,7 @@ class BytesJSON_V2(BytesConfig):
     """
     JSON representation of the bytes codec for zarr v2.
     """
+
     id: ReadOnly[Literal["bytes"]]
 
 

src/zarr/codecs/crc32c_.py

@@ -10,8 +10,9 @@
 
 from zarr.abc.codec import BytesBytesCodec, CodecJSON, CodecJSON_V2
 from zarr.core.common import JSON, NamedConfig, ZarrFormat, parse_named_configuration
-from zarr.registry import register_codec
 from zarr.errors import CodecValidationError
+from zarr.registry import register_codec
+
 if TYPE_CHECKING:
     from typing import Self
 

src/zarr/codecs/gzip.py

@@ -7,7 +7,8 @@
 
 from numcodecs.gzip import GZip
 from typing_extensions import ReadOnly
-from zarr.abc.codec import BytesBytesCodec, CodecJSON, CodecJSON_V2
+
+from zarr.abc.codec import BytesBytesCodec, CodecJSON
 from zarr.core.buffer.cpu import as_numpy_array_wrapper
 from zarr.core.common import (
     JSON,
@@ -41,6 +42,7 @@ class GZipJSON_V2(GZipConfig):
     """
     The JSON form of the GZip codec in Zarr V2.
     """
+
     id: ReadOnly[Literal["gzip"]]
 
 

src/zarr/codecs/sharding.py

@@ -17,9 +17,10 @@
     cast,
     overload,
 )
-from typing_extensions import ReadOnly
+
 import numpy as np
 import numpy.typing as npt
+from typing_extensions import ReadOnly
 
 from zarr.abc.codec import (
     ArrayBytesCodec,
@@ -31,7 +32,6 @@
     CodecJSON_V3,
     CodecPipeline,
 )
-from zarr.errors import CodecValidationError
 from zarr.abc.store import (
     ByteGetter,
     ByteRequest,
@@ -67,6 +67,7 @@
     morton_order_iter,
 )
 from zarr.core.metadata.v3 import parse_codecs
+from zarr.errors import CodecValidationError
 from zarr.registry import get_ndbuffer_class, get_pipeline_class, register_codec
 
 if TYPE_CHECKING:
@@ -101,8 +102,10 @@ class ShardingJSON_V2(ShardingConfigV2):
     """
     The JSON form of the sharding codec in Zarr V2.
     """
+
     id: ReadOnly[Literal["sharding_indexed"]]
 
+
 class ShardingJSON_V3(NamedRequiredConfig[Literal["sharding_indexed"], ShardingConfigV3]): ...
 
 

src/zarr/codecs/transpose.py

@@ -6,7 +6,8 @@
 
 import numpy as np
 from typing_extensions import ReadOnly
-from zarr.abc.codec import ArrayArrayCodec, CodecJSON, CodecJSON_V2
+
+from zarr.abc.codec import ArrayArrayCodec, CodecJSON
 from zarr.core.array_spec import ArraySpec
 from zarr.core.common import (
     JSON,
@@ -41,8 +42,10 @@ class TransposeJSON_V2(TransposeConfig):
     """
     The JSON form of the Transpose codec in Zarr V2.
     """
+
     id: ReadOnly[Literal["transpose"]]
 
+
 class TransposeJSON_V3(NamedRequiredConfig[Literal["transpose"], TransposeConfig]):
     """
     The JSON form of the Transpose codec in Zarr V3.

src/zarr/codecs/zstd.py

@@ -9,15 +9,16 @@
 import numcodecs
 from numcodecs.zstd import Zstd
 from packaging.version import Version
-from zarr.errors import CodecValidationError
 from typing_extensions import ReadOnly
+
 from zarr.abc.codec import BytesBytesCodec, CodecJSON
 from zarr.core.buffer.cpu import as_numpy_array_wrapper
 from zarr.core.common import (
     JSON,
     NamedRequiredConfig,
     ZarrFormat,
 )
+from zarr.errors import CodecValidationError
 from zarr.registry import register_codec
 
 if TYPE_CHECKING:
@@ -40,6 +41,7 @@ class ZstdJSON_V2(ZstdConfig_V2):
     """
     The JSON form of the ZStandard codec in Zarr v2.
     """
+
     id: ReadOnly[Literal["zstd"]]
 
 

src/zarr/errors.py

@@ -67,6 +67,7 @@ class NodeTypeValidationError(MetadataValidationError):
     for example an 'array' node when we expected a 'group'.
     """
 
+
 class CodecValidationError(BaseZarrError):
     """Raised when the Zarr codec metadata is invalid in some way"""
 

tests/test_codecs/test_blosc.py

@@ -13,18 +13,38 @@
 from zarr.storage import StorePath
 
 
-@pytest.mark.parametrize('shuffle', BLOSC_SHUFFLE)
-@pytest.mark.parametrize('cname', BLOSC_CNAME)
-@pytest.mark.parametrize('clevel', [1,2])
-@pytest.mark.parametrize('blocksize', [1,2])
-@pytest.mark.parametrize('typesize', [1,2])
-def test_to_json_v2(cname: BloscCname, shuffle: BloscShuffle, clevel: int, blocksize: int, typesize: int) -> None:
-    codec=  BloscCodec(shuffle=shuffle, cname=cname, clevel=clevel, blocksize=blocksize, typesize=typesize)
-    expected_v2: BloscJSON_V2 = {"id": "blosc", "cname": cname, "clevel": clevel, "shuffle": BLOSC_SHUFFLE.index(shuffle), "blocksize": blocksize}
-    expected_v3: BloscJSON_V3 = {"name": "blosc", "configuration": {"cname": cname, "clevel": clevel, "shuffle": shuffle, "blocksize": blocksize, "typesize": typesize}}
+@pytest.mark.parametrize("shuffle", BLOSC_SHUFFLE)
+@pytest.mark.parametrize("cname", BLOSC_CNAME)
+@pytest.mark.parametrize("clevel", [1, 2])
+@pytest.mark.parametrize("blocksize", [1, 2])
+@pytest.mark.parametrize("typesize", [1, 2])
+def test_to_json_v2(
+    cname: BloscCname, shuffle: BloscShuffle, clevel: int, blocksize: int, typesize: int
+) -> None:
+    codec = BloscCodec(
+        shuffle=shuffle, cname=cname, clevel=clevel, blocksize=blocksize, typesize=typesize
+    )
+    expected_v2: BloscJSON_V2 = {
+        "id": "blosc",
+        "cname": cname,
+        "clevel": clevel,
+        "shuffle": BLOSC_SHUFFLE.index(shuffle),
+        "blocksize": blocksize,
+    }
+    expected_v3: BloscJSON_V3 = {
+        "name": "blosc",
+        "configuration": {
+            "cname": cname,
+            "clevel": clevel,
+            "shuffle": shuffle,
+            "blocksize": blocksize,
+            "typesize": typesize,
+        },
+    }
     assert codec.to_json(zarr_format=2) == expected_v2
     assert codec.to_json(zarr_format=3) == expected_v3
 
+
 @pytest.mark.parametrize("store", ["local", "memory"], indirect=["store"])
 @pytest.mark.parametrize("dtype", ["uint8", "uint16"])
 async def test_blosc_evolve(store: Store, dtype: str) -> None: