From ceab6b89e86857e64b04d17fb3e7118696f8258b Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Mon, 2 Aug 2021 15:11:45 -0400 Subject: [PATCH 1/5] BUG: fix FSStore.listdir when key_separator == '/' --- zarr/storage.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zarr/storage.py b/zarr/storage.py index d2de2cda4c..51399b5294 100644 --- a/zarr/storage.py +++ b/zarr/storage.py @@ -1163,7 +1163,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) From 407cd9810ca2cfe0d67110d37fc954d6670c5286 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Mon, 2 Aug 2021 15:17:04 -0400 Subject: [PATCH 2/5] Bump fsspec from 2021.6.0 to 2021.7.0 --- requirements_dev_optional.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements_dev_optional.txt b/requirements_dev_optional.txt index cad8d25ac9..58672e1209 100644 --- a/requirements_dev_optional.txt +++ b/requirements_dev_optional.txt @@ -17,6 +17,5 @@ flake8==3.9.2 pytest-cov==2.12.1 pytest-doctestplus==0.10.0 h5py==3.2.1 -s3fs==2021.6.0 -fsspec==2021.6.0 +fsspec[s3]==2021.7.0 moto[server]>=1.3.14 From f151ac619894b39269e30e086c66fdb15cfca2e8 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Wed, 1 Sep 2021 09:33:46 +0200 Subject: [PATCH 3/5] Bump to fsspec 2021.8.1 --- requirements_dev_optional.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev_optional.txt b/requirements_dev_optional.txt index 58672e1209..39c720c142 100644 --- a/requirements_dev_optional.txt +++ b/requirements_dev_optional.txt @@ -17,5 +17,5 @@ flake8==3.9.2 pytest-cov==2.12.1 pytest-doctestplus==0.10.0 h5py==3.2.1 -fsspec[s3]==2021.7.0 +fsspec[s3]==2021.8.1 moto[server]>=1.3.14 From 6d2f0323872c74b0ea773b8621fae5712e0b151e Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Wed, 1 Sep 2021 09:34:57 +0200 Subject: [PATCH 4/5] Fix fsspec bump --- requirements_dev_optional.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev_optional.txt b/requirements_dev_optional.txt index 39c720c142..b7833dcb18 100644 --- a/requirements_dev_optional.txt +++ b/requirements_dev_optional.txt @@ -17,5 +17,5 @@ flake8==3.9.2 pytest-cov==2.12.1 pytest-doctestplus==0.10.0 h5py==3.2.1 -fsspec[s3]==2021.8.1 +fsspec[s3]==2021.08.1 moto[server]>=1.3.14 From d3fbcc95f87a0246407d474350649c3804fedfa5 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Wed, 1 Sep 2021 09:53:52 +0200 Subject: [PATCH 5/5] Re-add moto dependency --- requirements_dev_optional.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements_dev_optional.txt b/requirements_dev_optional.txt index 404f95d660..f4f1c59e90 100644 --- a/requirements_dev_optional.txt +++ b/requirements_dev_optional.txt @@ -18,4 +18,5 @@ flake8==3.9.2 pytest-cov==2.12.1 pytest-doctestplus==0.10.1 h5py==3.4.0 -fsspec[s3]==2021.08.1 \ No newline at end of file +fsspec[s3]==2021.08.1 +moto[server]>=1.3.14