From 2982e98c818acb6a69d0e6e1e8256f51b70c1b80 Mon Sep 17 00:00:00 2001 From: Batuhan Taskaya Date: Tue, 2 Mar 2021 14:53:44 +0300 Subject: [PATCH] gs: Use rm() instead of delete() calls (#5535) delete is a direct alias to rm(), though apparently it is kind of broken on the latest release of gcsfs. This doesn't change any behavior but only uses rm() directly instead of the given alias. --- dvc/fs/fsspec_wrapper.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dvc/fs/fsspec_wrapper.py b/dvc/fs/fsspec_wrapper.py index 68a70bda0..b4c730ce7 100644 --- a/dvc/fs/fsspec_wrapper.py +++ b/dvc/fs/fsspec_wrapper.py @@ -71,7 +71,7 @@ class FSSpecWrapper(BaseFileSystem): yield path_info.replace(path=file) def remove(self, path_info): - self.fs.delete(self._with_bucket(path_info)) + self.fs.rm(self._with_bucket(path_info)) def info(self, path_info): info = self.fs.info(self._with_bucket(path_info)).copy() diff --git a/setup.py b/setup.py index 0686f40c3..41e7cff5c 100644 --- a/setup.py +++ b/setup.py @@ -95,7 +95,7 @@ install_requires = [ # Extra dependencies for remote integrations -gs = ["gcsfs @ git+https://github.com/isidentical/gcsfs@support-delete"] +gs = ["gcsfs>=0.7.2"] gdrive = ["pydrive2>=1.7.3", "six >= 1.13.0"] s3 = ["boto3>=1.9.201"] azure = ["adlfs>=0.6.3", "azure.identity>=1.4.0", "knack"]