diff --git a/dvc/dependency/repo.py b/dvc/dependency/repo.py index c55217603..8a2a6509e 100644 --- a/dvc/dependency/repo.py +++ b/dvc/dependency/repo.py @@ -63,7 +63,7 @@ class RepoDependency(Dependency): return {self.PARAM_PATH: self.def_path, self.PARAM_REPO: self.def_repo} def download(self, to, jobs=None): - from dvc.checkout import checkout + from dvc.objects.checkout import checkout for odb, objs in self.get_used_objs().items(): self.repo.cloud.pull(objs, jobs=jobs, odb=odb) diff --git a/dvc/checkout.py b/dvc/objects/checkout.py similarity index 100% rename from dvc/checkout.py rename to dvc/objects/checkout.py diff --git a/dvc/output.py b/dvc/output.py index 9bdf8e6af..530684335 100644 --- a/dvc/output.py +++ b/dvc/output.py @@ -9,7 +9,6 @@ from funcy import collecting, project from voluptuous import And, Any, Coerce, Length, Lower, Required, SetTo from dvc import objects, prompt -from dvc.checkout import checkout from dvc.exceptions import ( CheckoutError, CollectCacheError, @@ -17,6 +16,7 @@ from dvc.exceptions import ( MergeError, RemoteCacheRequiredError, ) +from dvc.objects.checkout import checkout from .fs import get_cloud_fs from .fs.hdfs import HDFSFileSystem diff --git a/tests/func/test_add.py b/tests/func/test_add.py index 52352858f..6b8768056 100644 --- a/tests/func/test_add.py +++ b/tests/func/test_add.py @@ -953,7 +953,8 @@ def test_add_with_cache_link_error(tmp_dir, dvc, mocker, capsys): tmp_dir.gen("foo", "foo") mocker.patch( - "dvc.checkout._do_link", side_effect=DvcException("link failed") + "dvc.objects.checkout._do_link", + side_effect=DvcException("link failed"), ) dvc.add("foo") err = capsys.readouterr()[1]