Merge remote-tracking branch 'upstream/master' into metadata-classes-v2

Author: grlee77

requirements_dev_numpy.txt

@@ -1,4 +1,4 @@
 # Break this out into a separate file to allow testing against
 # different versions of numpy. This file should pin to the latest
 # numpy version.
-numpy==1.21.2
+numpy==1.21.3

zarr/_storage/store.py

@@ -117,6 +117,7 @@ class Store(BaseStore):
     .. added: 2.11.0
 
     """
+
     def listdir(self, path: str = "") -> List[str]:
         path = normalize_storage_path(path)
         return _listdir_from_keys(self, path)

zarr/storage.py

@@ -2109,7 +2109,7 @@ class LRUStoreCache(Store):
     """
 
     def __init__(self, store: StoreLike, max_size: int):
-        self._store: BaseStore = Store._ensure_store(store)
+        self._store: BaseStore = BaseStore._ensure_store(store)
         self._max_size = max_size
         self._current_size = 0
         self._keys_cache = None

zarr/tests/test_storage.py

@@ -1936,7 +1936,6 @@ def test_migrate_1to2(dict_store):
 
     # setup
     store = dict() if dict_store else KVStore(dict())
-
     meta = dict(
         shape=(100,),
         chunks=(10,),