Fix FSStore.listdir behavior for nested directories (#802)

* BUG: fix FSStore.listdir when key_separator == '/'

* Bump fsspec from 2021.6.0 to 2021.7.0

* Bump to fsspec 2021.8.1

* Fix fsspec bump

* Re-add moto dependency

Co-authored-by: Josh Moore <[email protected]>

Author: grlee77

requirements_dev_optional.txt

@@ -18,7 +18,5 @@ flake8==3.9.2
 pytest-cov==2.12.1
 pytest-doctestplus==0.10.1
 h5py==3.4.0
-s3fs==2021.6.0
-fsspec==2021.6.0
-aiobotocore!=1.4.0
+fsspec[s3]==2021.08.1
 moto[server]>=1.3.14

zarr/storage.py

@@ -1189,7 +1189,8 @@ def listdir(self, path=None):
                             for file_name in self.fs.find(entry_path):
                                 file_path = os.path.join(dir_path, file_name)
                                 rel_path = file_path.split(root_path)[1]
-                                new_children.append(rel_path.replace(os.path.sep, '.'))
+                                rel_path = rel_path.lstrip('/')
+                                new_children.append(rel_path.replace('/', '.'))
                         else:
                             new_children.append(entry)
                     return sorted(new_children)