Remove v3 tests

Author: dstansby

zarr/convenience.py

@@ -22,7 +22,11 @@
     BaseStore,
     ConsolidatedMetadataStore,
 )
-from zarr._storage.v3 import ConsolidatedMetadataStoreV3
+from zarr._storage.store import v3_api_available
+
+if v3_api_available:
+    from zarr._storage.v3 import ConsolidatedMetadataStoreV3
+
 from zarr.util import TreeViewer, buffer_size, normalize_storage_path
 
 from typing import Union

zarr/hierarchy.py

@@ -46,7 +46,11 @@
     rename,
     rmdir,
 )
-from zarr._storage.v3 import MemoryStoreV3
+from zarr._storage.store import v3_api_available
+
+if v3_api_available:
+    from zarr._storage.v3 import MemoryStoreV3
+
 from zarr.util import (
     InfoReporter,
     TreeViewer,
@@ -609,27 +613,33 @@ def groups(self):
             for key in sorted(listdir(self._store, self._path)):
                 path = self._key_prefix + key
                 if contains_group(self._store, path, explicit_only=False):
-                    yield key, Group(
+                    yield (
+                        key,
+                        Group(
+                            self._store,
+                            path=path,
+                            read_only=self._read_only,
+                            chunk_store=self._chunk_store,
+                            cache_attrs=self.attrs.cache,
+                            synchronizer=self._synchronizer,
+                            zarr_version=self._version,
+                        ),
+                    )
+
+        else:
+            for key in self.group_keys():
+                path = self._key_prefix + key
+                yield (
+                    key,
+                    Group(
                         self._store,
                         path=path,
                         read_only=self._read_only,
                         chunk_store=self._chunk_store,
                         cache_attrs=self.attrs.cache,
                         synchronizer=self._synchronizer,
                         zarr_version=self._version,
-                    )
-
-        else:
-            for key in self.group_keys():
-                path = self._key_prefix + key
-                yield key, Group(
-                    self._store,
-                    path=path,
-                    read_only=self._read_only,
-                    chunk_store=self._chunk_store,
-                    cache_attrs=self.attrs.cache,
-                    synchronizer=self._synchronizer,
-                    zarr_version=self._version,
+                    ),
                 )
 
     def array_keys(self, recurse=False):

zarr/tests/test_attrs.py

@@ -7,21 +7,22 @@
 from zarr._storage.store import meta_root
 from zarr.attrs import Attributes
 from zarr.storage import KVStore, DirectoryStore
-from zarr._storage.v3 import KVStoreV3
-from zarr.tests.util import CountingDict, CountingDictV3
+
+
+from zarr.tests.util import CountingDict
 from zarr.hierarchy import group
 
+pytestmark = pytest.mark.filterwarnings("ignore:zarr.*v3 is deprecated:DeprecationWarning")
 
-@pytest.fixture(params=[2, 3])
+
+@pytest.fixture(params=[2])
 def zarr_version(request):
     return request.param
 
 
 def _init_store(version):
     """Use a plain dict() for v2, but KVStoreV3 otherwise."""
-    if version == 2:
-        return dict()
-    return KVStoreV3(dict())
+    return dict
 
 
 class TestAttributes:
@@ -154,8 +155,8 @@ def test_caching_on(self, zarr_version):
         # caching is turned on by default
 
         # setup store
-        store = CountingDict() if zarr_version == 2 else CountingDictV3()
-        attrs_key = ".zattrs" if zarr_version == 2 else "meta/root/attrs"
+        store = CountingDict()
+        attrs_key = ".zattrs"
         assert 0 == store.counter["__getitem__", attrs_key]
         assert 0 == store.counter["__setitem__", attrs_key]
         if zarr_version == 2:
@@ -228,7 +229,7 @@ def test_caching_on(self, zarr_version):
 
     def test_caching_off(self, zarr_version):
         # setup store
-        store = CountingDict() if zarr_version == 2 else CountingDictV3()
+        store = CountingDict()
         attrs_key = ".zattrs" if zarr_version == 2 else "meta/root/attrs"
         assert 0 == store.counter["__getitem__", attrs_key]
         assert 0 == store.counter["__setitem__", attrs_key]