more more more

Author: jhamman

tests/test_api.py

@@ -21,7 +21,7 @@
     save_array,
     save_group,
 )
-from zarr.core.common import ZarrFormat
+from zarr.core.common import MemoryOrder, ZarrFormat
 from zarr.errors import MetadataValidationError
 from zarr.storage._utils import normalize_path
 from zarr.storage.memory import MemoryStore
@@ -208,7 +208,7 @@ def test_open_with_mode_w_minus(tmp_path: pathlib.Path) -> None:
 
 @pytest.mark.parametrize("order", ["C", "F", None])
 @pytest.mark.parametrize("zarr_format", [2, 3])
-def test_array_order(order: Literal["C", "F"] | None, zarr_format: ZarrFormat) -> None:
+def test_array_order(order: MemoryOrder | None, zarr_format: ZarrFormat) -> None:
     arr = zarr.ones(shape=(2, 2), order=order, zarr_format=zarr_format)
     expected = order or zarr.config.get("array.order")
     assert arr.order == expected

tests/test_array.py

@@ -10,7 +10,7 @@
 from zarr.codecs import BytesCodec, VLenBytesCodec
 from zarr.core.array import chunks_initialized
 from zarr.core.buffer.cpu import NDBuffer
-from zarr.core.common import JSON, ZarrFormat
+from zarr.core.common import JSON, MemoryOrder, ZarrFormat
 from zarr.core.group import AsyncGroup
 from zarr.core.indexing import ceildiv
 from zarr.core.sync import sync
@@ -422,7 +422,9 @@ def test_update_attrs(zarr_format: int) -> None:
 @pytest.mark.parametrize("order", ["C", "F", None])
 @pytest.mark.parametrize("zarr_format", [2, 3])
 @pytest.mark.parametrize("store", ["memory"], indirect=True)
-def test_array_create_order(order: str | None, zarr_format: int, store: MemoryStore) -> None:
+def test_array_create_order(
+    order: MemoryOrder | None, zarr_format: int, store: MemoryStore
+) -> None:
     arr = Array.create(store=store, shape=(2, 2), order=order, zarr_format=zarr_format, dtype="i4")
     expected = order or zarr.config.get("array.order")
     assert arr.order == expected