Merge branch 'master' into fix-structured

Author: joshmoore

docs/release.rst

@@ -6,18 +6,31 @@ Release notes
 Unreleased
 ----------
 
+.. _release_2.9.4:
+
+2.9.4
+-----
+
 Bug fixes
 ~~~~~~~~~
 
 * Fix structured arrays that contain objects
   By :user: `Attila Bergou <abergou>`; :issue: `806`
 
+.. _release_2.9.3:
+
+2.9.3
+-----
+
 Maintenance
 ~~~~~~~~~~~
 
 * Mark the fact that some tests that require ``fsspec``, without compromising the code coverage score.
   By :user:`Ben Williams <benjaminhwilliams>`; :issue:`823`.
 
+* Only inspect alternate node type if desired isn't present.
+  By :user:`Trevor Manz <manzt>`; :issue:`696`.
+
 .. _release_2.9.2:
 
 2.9.2

requirements_dev_optional.txt

@@ -12,12 +12,12 @@ types-redis
 types-setuptools
 pymongo==3.12.0
 # optional test requirements
-tox==3.24.1
+tox==3.24.3
 coverage
 flake8==3.9.2
 pytest-cov==2.12.1
 pytest-doctestplus==0.10.1
-h5py==3.3.0
+h5py==3.4.0
 s3fs==2021.6.0
 fsspec==2021.6.0
 aiobotocore!=1.4.0

zarr/creation.py

@@ -507,9 +507,9 @@ def open_array(
     # ensure store is initialized
 
     if mode in ['r', 'r+']:
-        if contains_group(store, path=path):
-            raise ContainsGroupError(path)
-        elif not contains_array(store, path=path):
+        if not contains_array(store, path=path):
+            if contains_group(store, path=path):
+                raise ContainsGroupError(path)
             raise ArrayNotFoundError(path)
 
     elif mode == 'w':
@@ -519,9 +519,9 @@ def open_array(
                    object_codec=object_codec, chunk_store=chunk_store)
 
     elif mode == 'a':
-        if contains_group(store, path=path):
-            raise ContainsGroupError(path)
-        elif not contains_array(store, path=path):
+        if not contains_array(store, path=path):
+            if contains_group(store, path=path):
+                raise ContainsGroupError(path)
             init_array(store, shape=shape, chunks=chunks, dtype=dtype,
                        compressor=compressor, fill_value=fill_value,
                        order=order, filters=filters, path=path,

zarr/hierarchy.py

@@ -1162,18 +1162,18 @@ def open_group(store=None, mode='a', cache_attrs=True, synchronizer=None, path=N
     # ensure store is initialized
 
     if mode in ['r', 'r+']:
-        if contains_array(store, path=path):
-            raise ContainsArrayError(path)
-        elif not contains_group(store, path=path):
+        if not contains_group(store, path=path):
+            if contains_array(store, path=path):
+                raise ContainsArrayError(path)
             raise GroupNotFoundError(path)
 
     elif mode == 'w':
         init_group(store, overwrite=True, path=path, chunk_store=chunk_store)
 
     elif mode == 'a':
-        if contains_array(store, path=path):
-            raise ContainsArrayError(path)
         if not contains_group(store, path=path):
+            if contains_array(store, path=path):
+                raise ContainsArrayError(path)
             init_group(store, path=path, chunk_store=chunk_store)
 
     elif mode in ['w-', 'x']:

zarr/tests/test_dim_separator.py

@@ -36,9 +36,19 @@ def dataset(tmpdir, request):
     if which.startswith("static"):
         project_root = pathlib.Path(zarr.__file__).resolve().parent.parent
         if which.endswith("nested"):
-            return str(project_root / "fixture/nested")
+            static = project_root / "fixture/nested"
+            generator = NestedDirectoryStore
         else:
-            return str(project_root / "fixture/flat")
+            static = project_root / "fixture/flat"
+            generator = DirectoryStore
+
+        if not static.exists():  # pragma: no cover
+            # store the data - should be one-time operation
+            s = generator(str(static))
+            a = zarr.open(store=s, mode="w", shape=(2, 2), dtype="<i8")
+            a[:] = [[1, 2], [3, 4]]
+
+        return str(static)
 
     if which.startswith("directory"):
         store_class = DirectoryStore