Merge branch 'fix-dstore' into pr-793+773

Author: joshmoore

requirements_dev_optional.txt

@@ -17,5 +17,6 @@ flake8==3.9.2
 pytest-cov==2.12.1
 pytest-doctestplus==0.10.1
 h5py==3.3.0
-fsspec==2021.7.0
+s3fs==2021.6.0
+fsspec==2021.6.0
 moto[server]>=1.3.14

zarr/core.py

@@ -1952,7 +1952,9 @@ def _process_for_setitem(self, ckey, chunk_selection, value, fields=None):
         return self._encode_chunk(chunk)
 
     def _chunk_key(self, chunk_coords):
-        return self._key_prefix + self._dimension_separator.join(map(str, chunk_coords))
+        rv = self._key_prefix + self._dimension_separator.join(map(str, chunk_coords))
+        print(f"CHUNK: {chunk_coords} --> {rv} ({self})")
+        return rv
 
     def _decode_chunk(self, cdata, start=None, nitems=None, expected_shape=None):
         # decompress

zarr/storage.py

@@ -1101,6 +1101,7 @@ def __init__(self, url, normalize_keys=True, key_separator=None,
             raise FSPathExistNotDir(url)
 
     def _normalize_key(self, key):
+        orig = key
         key = normalize_storage_path(key).lstrip('/')
         if key:
             *bits, end = key.split('/')
@@ -1109,7 +1110,9 @@ def _normalize_key(self, key):
                 end = end.replace('.', self.key_separator)
                 key = '/'.join(bits + [end])
 
-        return key.lower() if self.normalize_keys else key
+        key = key.lower() if self.normalize_keys else key
+        print(f"Store: {orig} --> {key} ({self})")
+        return key
 
     def getitems(self, keys, **kwargs):
         keys_transformed = [self._normalize_key(key) for key in keys]