diff --git a/dvc/command/checkout.py b/dvc/command/checkout.py index eb51a824b..d82230f17 100644 --- a/dvc/command/checkout.py +++ b/dvc/command/checkout.py @@ -1,6 +1,6 @@ import os -from dvc.command.base import CmdBase, DvcLock +from dvc.command.common.base import CmdBase, DvcLock from dvc.logger import Logger from dvc.system import System diff --git a/dvc/command/common/__init__.py b/dvc/command/common/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/dvc/command/base.py b/dvc/command/common/base.py similarity index 100% rename from dvc/command/base.py rename to dvc/command/common/base.py diff --git a/dvc/command/config.py b/dvc/command/config.py index 8db88b509..194e2215c 100644 --- a/dvc/command/config.py +++ b/dvc/command/config.py @@ -1,7 +1,7 @@ import os import configobj -from dvc.command.base import CmdBase, DvcLock +from dvc.command.common.base import CmdBase, DvcLock from dvc.logger import Logger from dvc.config import Config diff --git a/dvc/command/data_sync.py b/dvc/command/data_sync.py index 71f060877..a38c4e747 100644 --- a/dvc/command/data_sync.py +++ b/dvc/command/data_sync.py @@ -1,4 +1,4 @@ -from dvc.command.base import CmdBase, DvcLock +from dvc.command.common.base import CmdBase, DvcLock from dvc.logger import Logger import dvc.data_cloud as cloud diff --git a/dvc/command/find.py b/dvc/command/find.py index bf837d94d..d99ee159e 100644 --- a/dvc/command/find.py +++ b/dvc/command/find.py @@ -1,5 +1,5 @@ from dvc import utils -from dvc.command.base import CmdBase, DvcLock +from dvc.command.common.base import CmdBase, DvcLock from dvc.executor import ExecutorError from dvc.logger import Logger diff --git a/dvc/command/gc.py b/dvc/command/gc.py index ed39afc6a..acc24587d 100644 --- a/dvc/command/gc.py +++ b/dvc/command/gc.py @@ -1,6 +1,6 @@ import os -from dvc.command.base import DvcLock +from dvc.command.common.base import DvcLock from dvc.command.traverse import Traverse from dvc.logger import Logger from dvc.path.data_item import DataItemError diff --git a/dvc/command/import_file.py b/dvc/command/import_file.py index ff9e53126..7f50d935c 100644 --- a/dvc/command/import_file.py +++ b/dvc/command/import_file.py @@ -8,7 +8,7 @@ except ImportError: # pylint: disable=no-name-in-module, import-error from urllib.parse import urlparse -from dvc.command.base import CmdBase, DvcLock +from dvc.command.common.base import CmdBase, DvcLock from dvc.data_cloud import sizeof_fmt, file_md5 from dvc.logger import Logger from dvc.exceptions import DvcException diff --git a/dvc/command/init.py b/dvc/command/init.py index b5e3b5e40..44b807ffa 100644 --- a/dvc/command/init.py +++ b/dvc/command/init.py @@ -1,7 +1,7 @@ import os from pathlib import Path -from dvc.command.base import CmdBase +from dvc.command.common.base import CmdBase from dvc.logger import Logger from dvc.config import Config from dvc.exceptions import DvcException diff --git a/dvc/command/instance_create.py b/dvc/command/instance_create.py index 35237b152..ecd0a9412 100644 --- a/dvc/command/instance_create.py +++ b/dvc/command/instance_create.py @@ -1,5 +1,5 @@ from dvc.cloud.instance_manager import InstanceManager -from dvc.command.base import CmdBase, DvcLock +from dvc.command.common.base import CmdBase, DvcLock from dvc.exceptions import DvcException from dvc.logger import Logger diff --git a/dvc/command/lock.py b/dvc/command/lock.py index 9b8f8a674..4ac0b12e7 100644 --- a/dvc/command/lock.py +++ b/dvc/command/lock.py @@ -1,4 +1,4 @@ -from dvc.command.base import CmdBase, DvcLock +from dvc.command.common.base import CmdBase, DvcLock from dvc.logger import Logger from dvc.state_file import StateFile diff --git a/dvc/command/merge.py b/dvc/command/merge.py index ed30906e9..edaf39310 100644 --- a/dvc/command/merge.py +++ b/dvc/command/merge.py @@ -1,13 +1,13 @@ import os -import json -from dvc.command.base import CmdBase, DvcLock +from dvc.command.common.base import CmdBase, DvcLock from dvc.config import ConfigI from dvc.logger import Logger from dvc.state_file import StateFile from dvc.path.data_item import DataItem from dvc.system import System + class CmdMerge(CmdBase): def __init__(self, settings): super(CmdMerge, self).__init__(settings) diff --git a/dvc/command/repro.py b/dvc/command/repro.py index ff64210b3..433b5d6ab 100644 --- a/dvc/command/repro.py +++ b/dvc/command/repro.py @@ -1,7 +1,7 @@ import os import copy -from dvc.command.base import DvcLock +from dvc.command.common.base import DvcLock from dvc.command.import_file import CmdImportFile from dvc.command.run import CmdRun from dvc.logger import Logger diff --git a/dvc/command/run.py b/dvc/command/run.py index 30c081277..bb4595ad1 100644 --- a/dvc/command/run.py +++ b/dvc/command/run.py @@ -1,11 +1,9 @@ import os -import sys -from dvc.command.base import CmdBase, DvcLock +from dvc.command.common.base import CmdBase, DvcLock from dvc.exceptions import DvcException from dvc.git_wrapper import GitWrapper from dvc.logger import Logger -from dvc.path.data_item import DataDirError, NotInGitDirError from dvc.repository_change import RepositoryChange from dvc.state_file import StateFile from dvc.utils import cached_property diff --git a/dvc/command/show_pipeline.py b/dvc/command/show_pipeline.py index e54b31f55..1fe8c916c 100644 --- a/dvc/command/show_pipeline.py +++ b/dvc/command/show_pipeline.py @@ -2,7 +2,6 @@ import os import networkx as nx from dvc.command.traverse import Traverse -from dvc.command.init import CmdInit from dvc.logger import Logger from dvc.state_file import StateFile diff --git a/dvc/command/show_workflow.py b/dvc/command/show_workflow.py index 80322d99c..4d9d794b1 100644 --- a/dvc/command/show_workflow.py +++ b/dvc/command/show_workflow.py @@ -1,6 +1,6 @@ import os -from dvc.command.base import CmdBase +from dvc.command.common.base import CmdBase from dvc.logger import Logger diff --git a/dvc/command/traverse.py b/dvc/command/traverse.py index b4be15839..2d562a144 100644 --- a/dvc/command/traverse.py +++ b/dvc/command/traverse.py @@ -1,6 +1,6 @@ import os -from dvc.command.base import CmdBase, DvcLock +from dvc.command.common.base import CmdBase, DvcLock from dvc.exceptions import DvcException from dvc.logger import Logger from dvc.path.data_item import DataItemError