Skip if no fsspec

Author: Martin Durant

zarr/hierarchy.py

@@ -1096,7 +1096,7 @@ def group(store=None, overwrite=False, chunk_store=None,
 
 
 def open_group(store=None, mode='a', cache_attrs=True, synchronizer=None, path=None,
-               chunk_store=None):
+               chunk_store=None, storage_options=None):
     """Open a group using file-mode-like semantics.
 
     Parameters
@@ -1140,9 +1140,9 @@ def open_group(store=None, mode='a', cache_attrs=True, synchronizer=None, path=N
     """
 
     # handle polymorphic store arg
-    store = _normalize_store_arg(store)
+    store = _normalize_store_arg(store, storage_options=storage_options)
     if chunk_store is not None:
-        chunk_store = _normalize_store_arg(chunk_store)
+        chunk_store = _normalize_store_arg(chunk_store, storage_options=storage_options)
     path = normalize_storage_path(path)
 
     # ensure store is initialized

zarr/storage.py

@@ -1045,7 +1045,7 @@ def listdir(self, path=None):
         dir_path = self.dir_path(path)
         try:
             out = sorted(p.rstrip('/').rsplit('/', 1)[-1]
-                          for p in self.fs.ls(dir_path, detail=False))
+                         for p in self.fs.ls(dir_path, detail=False))
             return out
         except IOError:
             return []

zarr/tests/test_storage.py

@@ -30,7 +30,7 @@
                           attrs_key, default_compressor, getsize,
                           group_meta_key, init_array, init_group, migrate_1to2)
 from zarr.storage import FSStore
-from zarr.tests.util import CountingDict, skip_test_env_var
+from zarr.tests.util import CountingDict, have_fsspec, skip_test_env_var
 
 
 @contextmanager
@@ -828,6 +828,7 @@ def test_normalize_keys(self):
         assert 'foo' in store
 
 
+@pytest.mark.skipif(have_fsspec is False, reason="needs fsspec")
 class TestFSStore(StoreTests, unittest.TestCase):
 
     def create_store(self, normalize_keys=False):
@@ -857,8 +858,7 @@ class TestNestedDirectoryStore(TestDirectoryStore, unittest.TestCase):
     def create_store(self, normalize_keys=False):
         path = tempfile.mkdtemp()
         atexit.register(atexit_rmtree, path)
-        store = NestedDirectoryStore(path, normalize_keys=normalize_keys,
-                                     key_separator='/', auto_mkdir=True)
+        store = NestedDirectoryStore(path, normalize_keys=normalize_keys)
         return store
 
     def test_chunk_nesting(self):
@@ -987,6 +987,7 @@ def test_filters(self):
                 init_array(store, shape=1000, chunks=100, filters=filters)
 
 
+@pytest.mark.skipif(have_fsspec is False, reason="needs fsspec")
 class TestNestedFSStore(TestNestedDirectoryStore):
 
     def create_store(self, normalize_keys=False):

zarr/tests/util.py

@@ -46,3 +46,10 @@ def skip_test_env_var(name):
     """
     value = os.environ.get(name, '0')
     return pytest.mark.skipif(value == '0', reason='Tests not enabled via environment variable')
+
+
+try:
+    import fsspec  # noqa: F401
+    have_fsspec = True
+except ImportError:
+    have_fsspec = False