Skip to content

Commit c0d5407

Browse files
committed
simplify test_array
1 parent 9f45997 commit c0d5407

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

tests/test_array.py

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
from zarr.storage.common import StorePath
2323

2424

25-
@pytest.mark.parametrize("store", ["local", "memory", "zip", "remote"], indirect=["store"])
26-
@pytest.mark.parametrize("zarr_format", [2, 3])
25+
@pytest.mark.parametrize("store", ["local", "memory"], indirect=["store"])
2726
@pytest.mark.parametrize("exists_ok", [True, False])
2827
@pytest.mark.parametrize("extant_node", ["array", "group"])
2928
def test_array_creation_existing_node(
@@ -73,8 +72,7 @@ def test_array_creation_existing_node(
7372
)
7473

7574

76-
@pytest.mark.parametrize("store", ["local", "memory", "zip", "remote"], indirect=["store"])
77-
@pytest.mark.parametrize("zarr_format", [2, 3])
75+
@pytest.mark.parametrize("store", ["local", "memory"], indirect=["store"])
7876
async def test_create_creates_parents(
7977
store: LocalStore | MemoryStore, zarr_format: ZarrFormat
8078
) -> None:
@@ -113,8 +111,7 @@ async def test_create_creates_parents(
113111
assert isinstance(g, AsyncGroup)
114112

115113

116-
@pytest.mark.parametrize("store", ["local", "memory", "zip", "remote"], indirect=["store"])
117-
@pytest.mark.parametrize("zarr_format", [2, 3])
114+
@pytest.mark.parametrize("store", ["local", "memory"], indirect=["store"])
118115
def test_array_name_properties_no_group(
119116
store: LocalStore | MemoryStore, zarr_format: ZarrFormat
120117
) -> None:
@@ -124,8 +121,7 @@ def test_array_name_properties_no_group(
124121
assert arr.basename is None
125122

126123

127-
@pytest.mark.parametrize("store", ["local", "memory", "zip"], indirect=["store"])
128-
@pytest.mark.parametrize("zarr_format", [2, 3])
124+
@pytest.mark.parametrize("store", ["local", "memory"], indirect=["store"])
129125
def test_array_name_properties_with_group(
130126
store: LocalStore | MemoryStore, zarr_format: ZarrFormat
131127
) -> None:
@@ -254,7 +250,6 @@ async def test_array_v3_nan_fill_value(store: MemoryStore) -> None:
254250

255251

256252
@pytest.mark.parametrize("store", ["local"], indirect=["store"])
257-
@pytest.mark.parametrize("zarr_format", [2, 3])
258253
async def test_serializable_async_array(
259254
store: LocalStore | MemoryStore, zarr_format: ZarrFormat
260255
) -> None:
@@ -272,7 +267,6 @@ async def test_serializable_async_array(
272267

273268

274269
@pytest.mark.parametrize("store", ["local"], indirect=["store"])
275-
@pytest.mark.parametrize("zarr_format", [2, 3])
276270
def test_serializable_sync_array(store: LocalStore, zarr_format: ZarrFormat) -> None:
277271
expected = Array.create(
278272
store=store, shape=(100,), chunks=(10,), zarr_format=zarr_format, dtype="i4"
@@ -428,7 +422,6 @@ def test_vlen_errors() -> None:
428422
)
429423

430424

431-
@pytest.mark.parametrize("zarr_format", [2, 3])
432425
def test_update_attrs(zarr_format: int) -> None:
433426
# regression test for https://github.com/zarr-developers/zarr-python/issues/2328
434427
store = MemoryStore()
@@ -441,7 +434,6 @@ def test_update_attrs(zarr_format: int) -> None:
441434

442435

443436
@pytest.mark.parametrize("store", ["memory"], indirect=True)
444-
@pytest.mark.parametrize("zarr_format", [2, 3])
445437
def test_resize_1d(store: MemoryStore, zarr_format: int) -> None:
446438
z = zarr.create(
447439
shape=105, chunks=10, dtype="i4", fill_value=0, store=store, zarr_format=zarr_format
@@ -480,7 +472,6 @@ def test_resize_1d(store: MemoryStore, zarr_format: int) -> None:
480472

481473

482474
@pytest.mark.parametrize("store", ["memory"], indirect=True)
483-
@pytest.mark.parametrize("zarr_format", [2, 3])
484475
def test_resize_2d(store: MemoryStore, zarr_format: int) -> None:
485476
z = zarr.create(
486477
shape=(105, 105),
@@ -542,7 +533,6 @@ def test_resize_2d(store: MemoryStore, zarr_format: int) -> None:
542533

543534

544535
@pytest.mark.parametrize("store", ["memory"], indirect=True)
545-
@pytest.mark.parametrize("zarr_format", [2, 3])
546536
def test_append_1d(store: MemoryStore, zarr_format: int) -> None:
547537
a = np.arange(105)
548538
z = zarr.create(shape=a.shape, chunks=10, dtype=a.dtype, store=store, zarr_format=zarr_format)
@@ -572,7 +562,6 @@ def test_append_1d(store: MemoryStore, zarr_format: int) -> None:
572562

573563

574564
@pytest.mark.parametrize("store", ["memory"], indirect=True)
575-
@pytest.mark.parametrize("zarr_format", [2, 3])
576565
def test_append_2d(store: MemoryStore, zarr_format: int) -> None:
577566
a = np.arange(105 * 105, dtype="i4").reshape((105, 105))
578567
z = zarr.create(
@@ -596,7 +585,6 @@ def test_append_2d(store: MemoryStore, zarr_format: int) -> None:
596585

597586

598587
@pytest.mark.parametrize("store", ["memory"], indirect=True)
599-
@pytest.mark.parametrize("zarr_format", [2, 3])
600588
def test_append_2d_axis(store: MemoryStore, zarr_format: int) -> None:
601589
a = np.arange(105 * 105, dtype="i4").reshape((105, 105))
602590
z = zarr.create(
@@ -618,7 +606,6 @@ def test_append_2d_axis(store: MemoryStore, zarr_format: int) -> None:
618606

619607

620608
@pytest.mark.parametrize("store", ["memory"], indirect=True)
621-
@pytest.mark.parametrize("zarr_format", [2, 3])
622609
def test_append_bad_shape(store: MemoryStore, zarr_format: int) -> None:
623610
a = np.arange(100)
624611
z = zarr.create(shape=a.shape, chunks=10, dtype=a.dtype, store=store, zarr_format=zarr_format)
@@ -629,7 +616,6 @@ def test_append_bad_shape(store: MemoryStore, zarr_format: int) -> None:
629616

630617

631618
@pytest.mark.parametrize("order", ["C", "F", None])
632-
@pytest.mark.parametrize("zarr_format", [2, 3])
633619
@pytest.mark.parametrize("store", ["memory"], indirect=True)
634620
def test_array_create_order(
635621
order: MemoryOrder | None, zarr_format: int, store: MemoryStore

0 commit comments

Comments
 (0)