From 9634efeb84a06367be4147e11e8f0f6aa4fd309c Mon Sep 17 00:00:00 2001 From: Batuhan Taskaya Date: Thu, 29 Jul 2021 14:40:49 +0300 Subject: [PATCH] ssh: handle concurrency issues for raw command execution (#6370) * ssh: handle concurrency issues for raw command execution * setup: bump sshfs --- dvc/fs/fsspec_wrapper.py | 3 +++ setup.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dvc/fs/fsspec_wrapper.py b/dvc/fs/fsspec_wrapper.py index 1e0056399..959a36171 100644 --- a/dvc/fs/fsspec_wrapper.py +++ b/dvc/fs/fsspec_wrapper.py @@ -110,6 +110,9 @@ class FSSpecWrapper(BaseFileSystem): for file in self.find(path_info, **kwargs): yield path_info.replace(path=file) + def move(self, from_info, to_info): + self.fs.move(self._with_bucket(from_info), self._with_bucket(to_info)) + def remove(self, path_info): self.fs.rm_file(self._with_bucket(path_info)) diff --git a/setup.py b/setup.py index 0fd77d63b..67f17a8f3 100644 --- a/setup.py +++ b/setup.py @@ -101,7 +101,7 @@ s3 = ["s3fs==2021.7.0", "aiobotocore[boto3]>1.0.1"] azure = ["adlfs==2021.7.1", "azure-identity>=1.4.0", "knack"] # https://github.com/Legrandin/pycryptodome/issues/465 oss = ["ossfs==2021.7.5"] -ssh = ["sshfs>=2021.7.0"] +ssh = ["sshfs>=2021.7.1"] # Remove the env marker if/when pyarrow is available for Python3.9 hdfs = ["pyarrow>=2.0.0"] @@ -111,7 +111,7 @@ webdav = ["webdav4>=0.9.0"] # for linux and mac, so it will fail to compile if user doesn't have all the # requirements, including kerberos itself. Once all the wheels are available, # we can start shipping it by default. -ssh_gssapi = ["sshfs[gssapi]>=2021.7.0"] +ssh_gssapi = ["sshfs[gssapi]>=2021.7.1"] all_remotes = gs + s3 + azure + ssh + oss + gdrive + hdfs + webhdfs + webdav tests_requirements = (