Merge branch 'master' into fsspec_kwargs_bugfix

Author: joshmoore

docs/release.rst

@@ -6,8 +6,33 @@ Release notes
 Unreleased
 ----------
 
+.. _release_2.9.2:
+
+2.9.2
+-----
+
+Maintenance
+~~~~~~~~~~~
+
+* Correct conda-forge deployment of Zarr by fixing some Zarr tests.
+  By :user:`Ben Williams <benjaminhwilliams>`; :issue:`821`.
+
+
+.. _release_2.9.1:
+
+2.9.1
+-----
+
+Maintenance
+~~~~~~~~~~~
+
+* Correct conda-forge deployment of Zarr.
+  By :user:`Josh Moore <joshmoore>`; :issue:`XXX`.
+
 .. _release_2.9.0:
 
+2.9.0
+-----
 
 This release of Zarr Python is the first release of Zarr to not support Python 3.6.
 

zarr/storage.py

@@ -1255,17 +1255,6 @@ def __init__(self, suffix='', prefix='zarr', dir=None, normalize_keys=False,
 _prog_number = re.compile(r'^\d+$')
 
 
-def _nested_map_ckey(key):
-    segments = list(key.split('/'))
-    if segments:
-        last_segment = segments[-1]
-        if _prog_ckey.match(last_segment):
-            last_segment = last_segment.replace('.', '/')
-            segments = segments[:-1] + [last_segment]
-            key = '/'.join(segments)
-    return key
-
-
 class NestedDirectoryStore(DirectoryStore):
     """Storage class using directories and files on a standard file system, with
     special handling for chunk keys so that chunk files for multidimensional

zarr/tests/test_dim_separator.py

@@ -1,3 +1,5 @@
+import pathlib
+
 import pytest
 from numpy.testing import assert_array_equal
 
@@ -29,18 +31,19 @@ def dataset(tmpdir, request):
     kwargs = {}
 
     if which.startswith("static"):
+        project_root = pathlib.Path(zarr.__file__).resolve().parent.parent
         if which.endswith("nested"):
-            return "fixture/nested"
+            return str(project_root / "fixture/nested")
         else:
-            return "fixture/flat"
+            return str(project_root / "fixture/flat")
 
     if which.startswith("directory"):
         store_class = DirectoryStore
     elif which.startswith("nested"):
         store_class = NestedDirectoryStore
     else:
         if have_fsspec is False:
-            pytest.skip("no fsspec")
+            pytest.skip("no fsspec")  # pragma: no cover
         store_class = FSStore
         kwargs["mode"] = "w"
         kwargs["auto_mkdir"] = True
@@ -60,9 +63,10 @@ def verify(array):
 
 
 def test_open(dataset):
-    verify(zarr.open(dataset))
+    verify(zarr.open(dataset, "r"))
 
 
+@pytest.mark.skipif(have_fsspec is False, reason="needs fsspec")
 def test_fsstore(dataset):
     verify(Array(store=FSStore(dataset)))