use the new Zarr Context

python/kvikio/zarr.py

@@ -7,6 +7,7 @@
 
 import numpy
 import zarr.storage
+import zarr.version
 
 import kvikio
 
@@ -26,6 +27,11 @@ class GDSStore(zarr.storage.DirectoryStore):
     This is because only zarr.Array use getitems() to retrieve data.
     """
 
+    def __init__(self, *args, **kwargs) -> None:
+        if zarr.version.version_tuple < (2, 15):
+            raise RuntimeError("GDSStore requires Zarr v2.15+")
+        super().__init__(*args, **kwargs)
+
     def __eq__(self, other):
         return isinstance(other, GDSStore) and self.path == other.path
 
@@ -35,7 +41,10 @@ def _tofile(self, a, fn):
             assert written == a.nbytes
 
     def getitems(
-        self, keys: Sequence[str], contexts: Mapping[str, Mapping] = {}
+        self,
+        keys: Sequence[str],
+        *,
+        contexts: Mapping[str, Mapping] = {},
     ) -> Mapping[str, Any]:
 
         default_meta_array = numpy.empty(())

python/tests/test_zarr.py

@@ -8,10 +8,11 @@
 zarr = pytest.importorskip("zarr")
 GDSStore = pytest.importorskip("kvikio.zarr").GDSStore
 
-# To support CuPy arrays, we need the `meta_array` argument introduced in
-# Zarr v2.13, see <https://github.com/zarr-developers/zarr-python/pull/934>
-if not hasattr(zarr.Array, "meta_array"):
-    pytest.skip("requires Zarr v2.13+", allow_module_level=True)
+
+# To support CuPy arrays, we need the `Context` argument introduced in
+# Zarr v2.15, see <https://github.com/zarr-developers/zarr-python/pull/1131>
+if zarr.version.version_tuple < (2, 15):
+    pytest.skip("requires Zarr v2.15+", allow_module_level=True)
 
 
 @pytest.fixture
@@ -21,11 +22,9 @@ def store(tmp_path):
     return GDSStore(tmp_path / "test-file.zarr")
 
 
-@pytest.mark.parametrize("array_type", ["numpy", "cupy"])
-def test_direct_store_access(store, array_type):
+def test_direct_store_access(store, xp):
     """Test accessing the GDS Store directly"""
 
-    xp = pytest.importorskip(array_type)
     a = xp.arange(5, dtype="u1")
     store["a"] = a
     b = store["a"]