dvc: separate cache and remote classes (#4245)

Finalizes code part of #4050

tests/func/remote/test_index.py

@@ -5,7 +5,8 @@ import pytest
 from dvc.exceptions import DownloadError, UploadError
 from dvc.remote.base import Remote
 from dvc.remote.index import RemoteIndex
-from dvc.remote.local import LocalRemote, LocalTree
+from dvc.remote.local import LocalRemote
+from dvc.tree.local import LocalTree
 from dvc.utils.fs import remove
 
 

tests/func/test_add.py

@@ -21,10 +21,10 @@ from dvc.exceptions import (
 )
 from dvc.main import main
 from dvc.output.base import OutputAlreadyTrackedError, OutputIsStageFileError
-from dvc.remote.local import LocalTree
 from dvc.repo import Repo as DvcRepo
 from dvc.stage import Stage
 from dvc.system import System
+from dvc.tree.local import LocalTree
 from dvc.utils import LARGE_DIR_SIZE, file_md5, relpath
 from dvc.utils.fs import path_isin
 from dvc.utils.yaml import load_yaml

tests/func/test_cache.py

@@ -5,8 +5,8 @@ import configobj
 import pytest
 
 from dvc.cache import Cache
+from dvc.cache.base import DirCacheError
 from dvc.main import main
-from dvc.remote.base import DirCacheError
 from dvc.utils import relpath
 from tests.basic_env import TestDir, TestDvc
 

tests/func/test_checkout.py

@@ -7,6 +7,7 @@ import shutil
 import pytest
 from mock import patch
 
+from dvc.cache.base import CloudCache
 from dvc.dvcfile import DVC_FILE_SUFFIX, PIPELINE_FILE, Dvcfile
 from dvc.exceptions import (
     CheckoutError,
@@ -16,7 +17,7 @@ from dvc.exceptions import (
     NoOutputOrStageError,
 )
 from dvc.main import main
-from dvc.remote.base import CloudCache, Remote
+from dvc.remote.base import Remote
 from dvc.repo import Repo as DvcRepo
 from dvc.stage import Stage
 from dvc.stage.exceptions import StageFileDoesNotExistError

tests/func/test_data_cloud.py

@@ -6,11 +6,11 @@ import pytest
 from flaky.flaky_decorator import flaky
 
 from dvc.cache import NamedCache
+from dvc.cache.base import STATUS_DELETED, STATUS_NEW, STATUS_OK
 from dvc.external_repo import clean_repos
 from dvc.main import main
-from dvc.remote.base import STATUS_DELETED, STATUS_NEW, STATUS_OK
-from dvc.remote.local import LocalTree
 from dvc.stage.exceptions import StageNotFound
+from dvc.tree.local import LocalTree
 from dvc.utils.fs import remove
 from dvc.utils.yaml import dump_yaml, load_yaml
 

tests/func/test_external_repo.py

@@ -4,8 +4,8 @@ from mock import patch
 
 from dvc.external_repo import external_repo
 from dvc.path_info import PathInfo
-from dvc.remote.local import LocalTree
 from dvc.scm.git import Git
+from dvc.tree.local import LocalTree
 from dvc.utils import relpath
 from dvc.utils.fs import remove
 

tests/func/test_gc.py

@@ -8,8 +8,8 @@ from git import Repo
 
 from dvc.exceptions import CollectCacheError
 from dvc.main import main
-from dvc.remote.local import LocalTree
 from dvc.repo import Repo as DvcRepo
+from dvc.tree.local import LocalTree
 from dvc.utils.fs import remove
 from tests.basic_env import TestDir, TestDvcGit
 

tests/func/test_import.py

@@ -234,7 +234,7 @@ def test_download_error_pulling_imported_stage(tmp_dir, dvc, erepo_dir):
     remove(dst_cache)
 
     with patch(
-        "dvc.remote.local.LocalTree._download", side_effect=Exception
+        "dvc.tree.local.LocalTree._download", side_effect=Exception
     ), pytest.raises(DownloadError):
         dvc.pull(["foo_imported.dvc"])
 

tests/func/test_repro.py

@@ -15,10 +15,10 @@ from dvc.exceptions import (
 )
 from dvc.main import main
 from dvc.output.base import BaseOutput
-from dvc.remote.local import LocalTree
 from dvc.stage import Stage
 from dvc.stage.exceptions import StageFileDoesNotExistError
 from dvc.system import System
+from dvc.tree.local import LocalTree
 from dvc.utils import file_md5, relpath
 from dvc.utils.fs import remove
 from dvc.utils.yaml import dump_yaml, load_yaml

tests/func/test_s3.py

@@ -5,7 +5,7 @@ import moto.s3.models as s3model
 import pytest
 from moto import mock_s3
 
-from dvc.remote.base import CloudCache
+from dvc.cache.base import CloudCache
 from dvc.tree.s3 import S3Tree
 from tests.remotes import S3
 

tests/func/test_stage.py

@@ -6,10 +6,10 @@ import pytest
 from dvc.dvcfile import SingleStageFile
 from dvc.main import main
 from dvc.output.local import LocalOutput
-from dvc.remote.local import LocalTree
 from dvc.repo import Repo
 from dvc.stage import PipelineStage, Stage
 from dvc.stage.exceptions import StageFileFormatError
+from dvc.tree.local import LocalTree
 from dvc.utils.yaml import dump_yaml, load_yaml
 from tests.basic_env import TestDvc
 

tests/unit/output/test_local.py

@@ -2,8 +2,8 @@ import os
 
 from mock import patch
 
+from dvc.cache.local import LocalCache
 from dvc.output import LocalOutput
-from dvc.remote.local import LocalCache
 from dvc.stage import Stage
 from dvc.utils import relpath
 from tests.basic_env import TestDvc

tests/unit/remote/test_local.py

@@ -4,9 +4,9 @@ import os
 import pytest
 
 from dvc.cache import NamedCache
+from dvc.cache.local import LocalCache
 from dvc.path_info import PathInfo
 from dvc.remote.index import RemoteIndexNoop
-from dvc.remote.local import LocalCache
 from dvc.tree.local import LocalTree