From 5db382c9af1ca27b36465bbd71a242f5427f8871 Mon Sep 17 00:00:00 2001 From: Ivan Shcheklein Date: Mon, 28 Jan 2019 20:56:53 -0800 Subject: [PATCH 1/2] minor: clarify the comment around local remote move operation --- dvc/remote/local.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dvc/remote/local.py b/dvc/remote/local.py index 4815d5aba..e455d4160 100644 --- a/dvc/remote/local.py +++ b/dvc/remote/local.py @@ -357,8 +357,9 @@ class RemoteLOCAL(RemoteBase): self.safe_remove({'scheme': 'local', 'path': file}, force=force) def _move(self, inp, outp): - # moving in two stages to make last the move atomic in - # case inp and outp are in different filesystems + # moving in two stages to make the whole operation atomic in + # case inp and outp are in different filesystems and actual + # physical copying of data is happening tmp = '{}.{}'.format(outp, str(uuid.uuid4())) move(inp, tmp) move(tmp, outp) From 2e661194651083a7cfadcfea88062c8ff833b154 Mon Sep 17 00:00:00 2001 From: Ivan Shcheklein Date: Mon, 28 Jan 2019 20:57:36 -0800 Subject: [PATCH 2/2] boto version up to make aws dependencies compatible with test requirements --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6d0905406..696a24ddd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ azure-storage-blob==1.3.0 -boto3==1.7.4 +boto3==1.9.86 ply>=3.9 # See https://github.com/pyinstaller/pyinstaller/issues/1945 configparser>=3.5.0 zc.lockfile>=1.2.1