test_v2_and_v3_exist_at_same_path

Author: brokkoli71

src/zarr/core/array.py

@@ -134,7 +134,7 @@
 logger = getLogger(__name__)
 
 
-def parse_array_metadata(data: ArrayMetadata | ArrayMetadataDict) -> ArrayMetadata:
+def parse_array_metadata(data: ArrayMetadata | dict[str, JSON]) -> ArrayMetadata:
     if isinstance(data, ArrayMetadata):
         return data
     elif isinstance(data, dict):
@@ -152,7 +152,7 @@ def parse_array_metadata(data: ArrayMetadata | ArrayMetadataDict) -> ArrayMetada
             return ArrayV2Metadata.from_dict(data)
         else:
             raise ValueError(f"Invalid zarr_format: {zarr_format}. Expected 2 or 3")
-    raise TypeError
+    raise TypeError  # pragma: no cover
 
 
 def create_codec_pipeline(metadata: ArrayMetadata) -> CodecPipeline:
@@ -161,8 +161,7 @@ def create_codec_pipeline(metadata: ArrayMetadata) -> CodecPipeline:
     elif isinstance(metadata, ArrayV2Metadata):
         v2_codec = V2Codec(filters=metadata.filters, compressor=metadata.compressor)
         return get_pipeline_class().from_codecs([v2_codec])
-    else:
-        raise TypeError
+    raise TypeError  # pragma: no cover
 
 
 async def get_array_metadata(

tests/test_api.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import re
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -156,6 +157,15 @@ async def test_open_array(memory_store: MemoryStore, zarr_format: ZarrFormat) ->
         open(store="doesnotexist", mode="r", zarr_format=zarr_format)
 
 
+@pytest.mark.parametrize("store", ["memory", "local", "zip"], indirect=True)
+def test_v2_and_v3_exist_at_same_path(store: Store) -> None:
+    zarr.create_array(store, shape=(10,), dtype="uint8", zarr_format=3)
+    zarr.create_array(store, shape=(10,), dtype="uint8", zarr_format=2)
+    msg = f"Both zarr.json (Zarr format 3) and .zarray (Zarr format 2) metadata objects exist at {store}. Zarr v3 will be used."
+    with pytest.warns(UserWarning, match=re.escape(msg)):
+        zarr.open(store=store, mode="r")
+
+
 @pytest.mark.parametrize("store", ["memory"], indirect=True)
 async def test_create_group(store: Store, zarr_format: ZarrFormat) -> None:
     attrs = {"foo": 100}

tests/test_array.py

@@ -1662,13 +1662,10 @@ async def test_sharding_coordinate_selection() -> None:
     assert isinstance(result, NDArrayLike)
     assert (result == np.array([[12, 13, 14, 15], [16, 17, 18, 19]])).all()
 
+
 @pytest.mark.parametrize("store", ["local", "memory", "zip"], indirect=["store"])
 def test_array_repr(store: Store) -> None:
     shape = (2, 3, 4)
     dtype = "uint8"
-    arr = zarr.create_array(
-        store,
-        shape=shape,
-        dtype=dtype
-    )
+    arr = zarr.create_array(store, shape=shape, dtype=dtype)
     assert str(arr) == f"<Array {store} shape={shape} dtype={dtype}>"