dvc: automatically reorder imports

.pre-commit-config.yaml

@@ -9,3 +9,8 @@ repos:
     hooks:
     - id: flake8
       language_version: python3
+-   repo: https://github.com/asottile/reorder_python_imports
+    rev: v1.8.0
+    hooks:
+    - id: reorder-python-imports
+      language_version: python3

.restyled.yaml

@@ -9,3 +9,13 @@ restylers:
     - "**/*.py"
     interpreters:
     - python
+  - name: reorder-python-imports
+    image: restyled/restyler-reorder-python-imports:v1.6.0
+    command:
+    - reorder-python-imports
+    - "--exit-zero-even-if-changed"
+    arguments: []
+    include:
+    - "**/*.py"
+    interpreters:
+    - python

dvc/__init__.py

@@ -3,13 +3,11 @@ DVC
 ----
 Make your data science projects reproducible and shareable.
 """
-
 from __future__ import unicode_literals
 
 import warnings
 
 import dvc.logger
-
 from dvc.version import __version__  # noqa: F401
 
 

dvc/__main__.py

@@ -1,5 +1,4 @@
 """Main entry point for dvc command line tool."""
-
 from __future__ import unicode_literals
 
 import sys

dvc/analytics.py

@@ -1,16 +1,14 @@
 """Collect and send usage analytics"""
-
 from __future__ import unicode_literals
 
-from dvc.utils.compat import str
-
-import os
-import json
 import errno
+import json
 import logging
+import os
 
 from dvc import __version__
 from dvc.utils import env2bool
+from dvc.utils.compat import str
 
 
 logger = logging.getLogger(__name__)

dvc/api.py

@@ -1,5 +1,5 @@
-from contextlib import contextmanager
 import os
+from contextlib import contextmanager
 
 try:
     from contextlib import _GeneratorContextManager as GCM

dvc/cache.py

@@ -1,13 +1,13 @@
 """Manages cache of a dvc repo."""
-
 from __future__ import unicode_literals
 
 import os
 from collections import defaultdict
+
 from funcy import cached_property
 
-from dvc.utils.compat import builtin_str
 from dvc.config import Config
+from dvc.utils.compat import builtin_str
 
 
 class CacheConfig(object):

dvc/cli.py

@@ -1,42 +1,41 @@
 """Command line interface for dvc."""
-
 from __future__ import print_function
 from __future__ import unicode_literals
 
-import sys
 import argparse
 import logging
+import sys
 
-from dvc.command.base import fix_subparsers
+import dvc.command.add as add
-import dvc.command.init as init
+import dvc.command.cache as cache
+import dvc.command.checkout as checkout
+import dvc.command.commit as commit
+import dvc.command.config as config
+import dvc.command.daemon as daemon
+import dvc.command.data_sync as data_sync
+import dvc.command.destroy as destroy
+import dvc.command.diff as diff
+import dvc.command.gc as gc
 import dvc.command.get as get
 import dvc.command.get_url as get_url
-import dvc.command.destroy as destroy
-import dvc.command.remove as remove
-import dvc.command.move as move
-import dvc.command.unprotect as unprotect
-import dvc.command.run as run
-import dvc.command.repro as repro
-import dvc.command.data_sync as data_sync
-import dvc.command.gc as gc
-import dvc.command.add as add
 import dvc.command.imp as imp
 import dvc.command.imp_url as imp_url
-import dvc.command.config as config
+import dvc.command.init as init
-import dvc.command.checkout as checkout
-import dvc.command.remote as remote
-import dvc.command.cache as cache
-import dvc.command.metrics as metrics
 import dvc.command.install as install
-import dvc.command.root as root
 import dvc.command.lock as lock
+import dvc.command.metrics as metrics
+import dvc.command.move as move
 import dvc.command.pipeline as pipeline
-import dvc.command.daemon as daemon
+import dvc.command.remote as remote
-import dvc.command.commit as commit
+import dvc.command.remove as remove
+import dvc.command.repro as repro
+import dvc.command.root as root
+import dvc.command.run as run
 import dvc.command.tag as tag
-import dvc.command.diff as diff
+import dvc.command.unprotect as unprotect
-import dvc.command.version as version
 import dvc.command.update as update
+import dvc.command.version as version
+from dvc.command.base import fix_subparsers
 from dvc.exceptions import DvcParserError
 
 

dvc/command/add.py

@@ -3,8 +3,9 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
-from dvc.command.base import CmdBase, append_doc_link
 from dvc.exceptions import RecursiveAddingWhileUsingFilename
 
 

dvc/command/base.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 
-import colorama
 import logging
 
+import colorama
+
 
 logger = logging.getLogger(__name__)
 

dvc/command/cache.py

@@ -2,9 +2,10 @@ from __future__ import unicode_literals
 
 import argparse
 
-from dvc.command.base import fix_subparsers, append_doc_link
-from dvc.command.config import CmdConfig
 from dvc.cache import CacheConfig
+from dvc.command.base import append_doc_link
+from dvc.command.base import fix_subparsers
+from dvc.command.config import CmdConfig
 
 
 class CmdCacheDir(CmdConfig):

dvc/command/checkout.py

@@ -2,7 +2,8 @@ from __future__ import unicode_literals
 
 import argparse
 
-from dvc.command.base import CmdBase, append_doc_link
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 
 
 class CmdCheckout(CmdBase):

dvc/command/commit.py

@@ -3,8 +3,9 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
-from dvc.command.base import CmdBase, append_doc_link
 
 
 logger = logging.getLogger(__name__)

dvc/command/config.py

@@ -3,7 +3,8 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
-from dvc.command.base import CmdBaseNoRepo, append_doc_link
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBaseNoRepo
 from dvc.config import Config
 
 

dvc/command/daemon.py

@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
-from dvc.command.base import CmdBaseNoRepo, fix_subparsers
+from dvc.command.base import CmdBaseNoRepo
+from dvc.command.base import fix_subparsers
 
 
 class CmdDaemonBase(CmdBaseNoRepo):

dvc/command/data_sync.py

@@ -3,7 +3,8 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
-from dvc.command.base import CmdBase, append_doc_link
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
 
 

dvc/command/destroy.py

@@ -4,7 +4,8 @@ import argparse
 import logging
 
 import dvc.prompt as prompt
-from dvc.command.base import CmdBase, append_doc_link
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
 
 

dvc/command/diff.py

@@ -1,14 +1,15 @@
 from __future__ import unicode_literals
 
 import argparse
+import logging
 
 import humanize
 import inflect
-import logging
 from funcy import compact
 
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
-from dvc.command.base import CmdBase, append_doc_link
 
 
 logger = logging.getLogger(__name__)

dvc/command/gc.py

@@ -1,11 +1,12 @@
 from __future__ import unicode_literals
 
 import argparse
-import os
-import dvc.prompt as prompt
 import logging
+import os
 
-from dvc.command.base import CmdBase, append_doc_link
+import dvc.prompt as prompt
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 
 
 logger = logging.getLogger(__name__)

dvc/command/get.py

@@ -3,8 +3,9 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
+from .base import append_doc_link
+from .base import CmdBaseNoRepo
 from dvc.exceptions import DvcException
-from .base import CmdBaseNoRepo, append_doc_link
 
 
 logger = logging.getLogger(__name__)

dvc/command/get_url.py

@@ -3,8 +3,9 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
+from .base import append_doc_link
+from .base import CmdBaseNoRepo
 from dvc.exceptions import DvcException
-from .base import CmdBaseNoRepo, append_doc_link
 
 
 logger = logging.getLogger(__name__)

dvc/command/imp.py

@@ -3,8 +3,9 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
-from dvc.command.base import CmdBase, append_doc_link
 
 
 logger = logging.getLogger(__name__)

dvc/command/imp_url.py

@@ -3,8 +3,9 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
-from dvc.command.base import CmdBase, append_doc_link
 
 
 logger = logging.getLogger(__name__)

dvc/command/init.py

@@ -3,7 +3,8 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
-from dvc.command.base import CmdBaseNoRepo, append_doc_link
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBaseNoRepo
 
 
 logger = logging.getLogger(__name__)

dvc/command/install.py

@@ -3,7 +3,8 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
-from dvc.command.base import CmdBase, append_doc_link
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 
 
 logger = logging.getLogger(__name__)

dvc/command/lock.py

@@ -3,8 +3,9 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
-from dvc.command.base import CmdBase, append_doc_link
 
 
 logger = logging.getLogger(__name__)

dvc/command/metrics.py

@@ -3,8 +3,11 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
-from dvc.exceptions import DvcException, BadMetricError
+from dvc.command.base import append_doc_link
-from dvc.command.base import CmdBase, fix_subparsers, append_doc_link
+from dvc.command.base import CmdBase
+from dvc.command.base import fix_subparsers
+from dvc.exceptions import BadMetricError
+from dvc.exceptions import DvcException
 
 
 logger = logging.getLogger(__name__)

dvc/command/move.py

@@ -3,8 +3,9 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
-from dvc.command.base import CmdBase, append_doc_link
 
 
 logger = logging.getLogger(__name__)

dvc/command/pipeline.py

@@ -1,13 +1,14 @@
 from __future__ import unicode_literals
 
-from dvc.utils import relpath
-from dvc.utils.compat import str
-
 import argparse
 import logging
 
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
+from dvc.command.base import fix_subparsers
 from dvc.exceptions import DvcException
-from dvc.command.base import CmdBase, fix_subparsers, append_doc_link
+from dvc.utils import relpath
+from dvc.utils.compat import str
 
 
 logger = logging.getLogger(__name__)

dvc/command/remote.py

@@ -3,7 +3,8 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
-from dvc.command.base import append_doc_link, fix_subparsers
+from dvc.command.base import append_doc_link
+from dvc.command.base import fix_subparsers
 from dvc.command.config import CmdConfig
 from dvc.remote.config import RemoteConfig
 

dvc/command/remove.py

@@ -4,8 +4,9 @@ import argparse
 import logging
 
 import dvc.prompt as prompt
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
-from dvc.command.base import CmdBase, append_doc_link
 
 
 logger = logging.getLogger(__name__)

dvc/command/repro.py

@@ -1,10 +1,11 @@
 from __future__ import unicode_literals
 
 import argparse
-import os
 import logging
+import os
 
-from dvc.command.base import CmdBase, append_doc_link
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 from dvc.command.metrics import show_metrics
 from dvc.command.status import CmdDataStatus
 from dvc.exceptions import DvcException

dvc/command/root.py

@@ -3,7 +3,8 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
-from dvc.command.base import CmdBaseNoRepo, append_doc_link
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBaseNoRepo
 from dvc.utils import relpath
 
 logger = logging.getLogger(__name__)

dvc/command/run.py

@@ -3,7 +3,8 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
-from dvc.command.base import CmdBase, append_doc_link
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
 
 

dvc/command/tag.py

@@ -1,8 +1,10 @@
 import logging
 
-from dvc.utils import to_yaml_string
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
+from dvc.command.base import fix_subparsers
 from dvc.exceptions import DvcException
-from dvc.command.base import CmdBase, fix_subparsers, append_doc_link
+from dvc.utils import to_yaml_string
 
 
 logger = logging.getLogger(__name__)

dvc/command/unprotect.py

@@ -3,8 +3,9 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
-from dvc.command.base import CmdBase, append_doc_link
 
 
 logger = logging.getLogger(__name__)

dvc/command/update.py

@@ -3,8 +3,9 @@ from __future__ import unicode_literals
 import argparse
 import logging
 
+from dvc.command.base import append_doc_link
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
-from dvc.command.base import CmdBase, append_doc_link
 
 
 logger = logging.getLogger(__name__)

dvc/command/version.py

@@ -1,11 +1,11 @@
 from __future__ import unicode_literals
 
+import argparse
+import itertools
+import logging
 import os
 import platform
-import argparse
-import logging
 import uuid
-import itertools
 
 try:
     import psutil

dvc/config.py

@@ -1,18 +1,24 @@
 """DVC config objects."""
-
 from __future__ import unicode_literals
 
-from dvc.utils.compat import str, open
-
-import os
-import re
 import copy
 import errno
-import configobj
 import logging
+import os
+import re
 
-from schema import Schema, Optional, And, Use, Regex, SchemaError
+import configobj
-from dvc.exceptions import DvcException, NotDvcRepoError
+from schema import And
+from schema import Optional
+from schema import Regex
+from schema import Schema
+from schema import SchemaError
+from schema import Use
+
+from dvc.exceptions import DvcException
+from dvc.exceptions import NotDvcRepoError
+from dvc.utils.compat import open
+from dvc.utils.compat import str
 
 logger = logging.getLogger(__name__)
 

dvc/daemon.py

@@ -1,15 +1,15 @@
 """Launch `dvc daemon` command in a separate detached process."""
-
 from __future__ import unicode_literals
 
-import os
-import sys
 import inspect
 import logging
+import os
+import sys
 from subprocess import Popen
 
 from dvc.env import DVC_DAEMON
-from dvc.utils import is_binary, fix_env
+from dvc.utils import fix_env
+from dvc.utils import is_binary
 from dvc.utils.compat import cast_bytes_py2
 
 

dvc/dagascii.py

@@ -1,14 +1,16 @@
 """Draws DAG in ASCII."""
-
-from __future__ import unicode_literals
 from __future__ import print_function
+from __future__ import unicode_literals
 
-import sys
 import math
+import sys
 
-from grandalf.graphs import Vertex, Edge, Graph
+from grandalf.graphs import Edge
+from grandalf.graphs import Graph
+from grandalf.graphs import Vertex
 from grandalf.layouts import SugiyamaLayout
-from grandalf.routing import route_with_lines, EdgeViewer
+from grandalf.routing import EdgeViewer
+from grandalf.routing import route_with_lines
 
 
 class VertexViewer(object):

dvc/data_cloud.py

@@ -1,10 +1,10 @@
 """Manages dvc remotes that user can use with push/pull/status comamnds."""
-
 from __future__ import unicode_literals
 
 import logging
 
-from dvc.config import Config, NoRemoteError
+from dvc.config import Config
+from dvc.config import NoRemoteError
 from dvc.remote import Remote
 
 

dvc/dependency/__init__.py

@@ -2,20 +2,18 @@ from __future__ import unicode_literals
 
 import schema
 
-from dvc.scheme import Schemes
-
 import dvc.output as output
-from dvc.output.base import OutputBase
+from .repo import DependencyREPO
-from dvc.dependency.s3 import DependencyS3
 from dvc.dependency.gs import DependencyGS
-from dvc.dependency.local import DependencyLOCAL
 from dvc.dependency.hdfs import DependencyHDFS
-from dvc.dependency.ssh import DependencySSH
 from dvc.dependency.http import DependencyHTTP
 from dvc.dependency.https import DependencyHTTPS
-from .repo import DependencyREPO
+from dvc.dependency.local import DependencyLOCAL
-
+from dvc.dependency.s3 import DependencyS3
+from dvc.dependency.ssh import DependencySSH
+from dvc.output.base import OutputBase
 from dvc.remote import Remote
+from dvc.scheme import Schemes
 
 
 DEPS = [

dvc/dependency/gs.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from dvc.output.gs import OutputGS
 from dvc.dependency.base import DependencyBase
+from dvc.output.gs import OutputGS
 
 
 class DependencyGS(DependencyBase, OutputGS):

dvc/dependency/hdfs.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from dvc.output.hdfs import OutputHDFS
 from dvc.dependency.base import DependencyBase
+from dvc.output.hdfs import OutputHDFS
 
 
 class DependencyHDFS(DependencyBase, OutputHDFS):

dvc/dependency/http.py

@@ -1,8 +1,8 @@
 from __future__ import unicode_literals
 
+from dvc.dependency.base import DependencyBase
 from dvc.output.base import OutputBase
 from dvc.remote.http import RemoteHTTP
-from dvc.dependency.base import DependencyBase
 
 
 class DependencyHTTP(DependencyBase, OutputBase):

dvc/dependency/https.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from dvc.remote.https import RemoteHTTPS
 from .http import DependencyHTTP
+from dvc.remote.https import RemoteHTTPS
 
 
 class DependencyHTTPS(DependencyHTTP):

dvc/dependency/repo.py

@@ -1,15 +1,14 @@
 from __future__ import unicode_literals
 
 import copy
+from contextlib import contextmanager
 
 from funcy import merge
 from schema import Optional
-from contextlib import contextmanager
-
-from dvc.external_repo import external_repo
-from dvc.utils.compat import str
 
 from .local import DependencyLOCAL
+from dvc.external_repo import external_repo
+from dvc.utils.compat import str
 
 
 class DependencyREPO(DependencyLOCAL):

dvc/dependency/s3.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from dvc.output.s3 import OutputS3
 from dvc.dependency.base import DependencyBase
+from dvc.output.s3 import OutputS3
 
 
 class DependencyS3(DependencyBase, OutputS3):

dvc/dependency/ssh.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from dvc.output.ssh import OutputSSH
 from dvc.dependency.base import DependencyBase
+from dvc.output.ssh import OutputSSH
 
 
 class DependencySSH(DependencyBase, OutputSSH):

dvc/exceptions.py

@@ -1,12 +1,11 @@
 """Exceptions raised by the dvc."""
-
 from __future__ import unicode_literals
 
-from dvc.utils.compat import str, builtin_str
-
 import traceback
 
 from dvc.utils import relpath
+from dvc.utils.compat import builtin_str
+from dvc.utils.compat import str
 
 
 class DvcException(Exception):

dvc/external_repo.py

@@ -2,9 +2,9 @@ from __future__ import unicode_literals
 
 import os
 import tempfile
+from contextlib import contextmanager
 from distutils.dir_util import copy_tree
 
-from contextlib import contextmanager
 from funcy import retry
 
 from dvc.utils import remove

dvc/ignore.py

@@ -2,11 +2,11 @@ from __future__ import unicode_literals
 
 import logging
 import os
+
 from pathspec import PathSpec
 from pathspec.patterns import GitWildMatchPattern
 
 from dvc.utils import relpath
-
 from dvc.utils.compat import open
 
 logger = logging.getLogger(__name__)

dvc/istextfile.py

@@ -1,8 +1,8 @@
 """Use heuristics to guess if it is a text file or a binary file."""
-
 from __future__ import unicode_literals
 
-from dvc.utils.compat import is_py3, open
+from dvc.utils.compat import is_py3
+from dvc.utils.compat import open
 
 # Based on https://eli.thegreenplace.net/2011/10/19/
 # perls-guess-if-file-is-text-or-binary-implemented-in-python

dvc/lock.py

@@ -1,9 +1,8 @@
 """Manages dvc lock file."""
-
 from __future__ import unicode_literals
 
-import os
 import hashlib
+import os
 import time
 from datetime import timedelta
 

dvc/logger.py

@@ -1,15 +1,16 @@
 """Manages logging configuration for dvc repo."""
-
 from __future__ import unicode_literals
 
-from dvc.utils.compat import str, StringIO, RecursionError
-from dvc.progress import Tqdm
-
-import logging
-import logging.handlers
 import logging.config
+import logging.handlers
+
 import colorama
 
+from dvc.progress import Tqdm
+from dvc.utils.compat import RecursionError
+from dvc.utils.compat import str
+from dvc.utils.compat import StringIO
+
 
 FOOTER = (
     "\n{yellow}Having any troubles?{nc}"

dvc/main.py

@@ -1,17 +1,17 @@
 """Main entry point for dvc CLI."""
-
 from __future__ import unicode_literals
 
 import logging
 
+from dvc.analytics import Analytics
 from dvc.cli import parse_args
+from dvc.config import ConfigError
+from dvc.exceptions import DvcParserError
+from dvc.exceptions import NotDvcRepoError
+from dvc.external_repo import clean_repos
 from dvc.lock import LockError
 from dvc.logger import FOOTER
-from dvc.config import ConfigError
-from dvc.analytics import Analytics
-from dvc.exceptions import NotDvcRepoError, DvcParserError
 from dvc.remote.pool import close_pools
-from dvc.external_repo import clean_repos
 from dvc.utils.compat import is_py2
 
 

dvc/output/__init__.py

@@ -2,20 +2,19 @@ from __future__ import unicode_literals
 
 import schema
 
-from dvc.scheme import Schemes
-from dvc.utils.compat import urlparse, str
-
 from dvc.output.base import OutputBase
-from dvc.output.s3 import OutputS3
 from dvc.output.gs import OutputGS
-from dvc.output.local import OutputLOCAL
 from dvc.output.hdfs import OutputHDFS
+from dvc.output.local import OutputLOCAL
+from dvc.output.s3 import OutputS3
 from dvc.output.ssh import OutputSSH
-
 from dvc.remote import Remote
-from dvc.remote.s3 import RemoteS3
 from dvc.remote.hdfs import RemoteHDFS
 from dvc.remote.local import RemoteLOCAL
+from dvc.remote.s3 import RemoteS3
+from dvc.scheme import Schemes
+from dvc.utils.compat import str
+from dvc.utils.compat import urlparse
 
 OUTS = [
     OutputHDFS,

dvc/output/base.py

@@ -3,13 +3,16 @@ from __future__ import unicode_literals
 import logging
 from copy import copy
 
-from schema import Or, Optional
+from schema import Optional
+from schema import Or
 
-from dvc.cache import NamedCache
 import dvc.prompt as prompt
-from dvc.exceptions import DvcException, CollectCacheError
+from dvc.cache import NamedCache
-from dvc.utils.compat import str, urlparse
+from dvc.exceptions import CollectCacheError
+from dvc.exceptions import DvcException
 from dvc.remote.base import RemoteBASE
+from dvc.utils.compat import str
+from dvc.utils.compat import urlparse
 
 
 logger = logging.getLogger(__name__)

dvc/output/gs.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from dvc.remote.gs import RemoteGS
 from dvc.output.s3 import OutputS3
+from dvc.remote.gs import RemoteGS
 
 
 class OutputGS(OutputS3):

dvc/output/local.py

@@ -1,13 +1,15 @@
 from __future__ import unicode_literals
 
-import os
 import logging
+import os
 
-from dvc.utils.compat import urlparse, fspath_py35, str
-from dvc.istextfile import istextfile
 from dvc.exceptions import DvcException
-from dvc.remote.local import RemoteLOCAL
+from dvc.istextfile import istextfile
 from dvc.output.base import OutputBase
+from dvc.remote.local import RemoteLOCAL
+from dvc.utils.compat import fspath_py35
+from dvc.utils.compat import str
+from dvc.utils.compat import urlparse
 
 
 logger = logging.getLogger(__name__)

dvc/output/s3.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from dvc.remote.s3 import RemoteS3
 from dvc.output.base import OutputBase
+from dvc.remote.s3 import RemoteS3
 
 
 class OutputS3(OutputBase):

dvc/path_info.py

@@ -1,14 +1,19 @@
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import
+from __future__ import unicode_literals
 
-import sys
 import os
 import posixpath
+import sys
 
 from funcy import cached_property
 
-from dvc.utils.compat import str, builtin_str, basestring, is_py2
-from dvc.utils.compat import pathlib, urlparse
 from dvc.utils import relpath
+from dvc.utils.compat import basestring
+from dvc.utils.compat import builtin_str
+from dvc.utils.compat import is_py2
+from dvc.utils.compat import pathlib
+from dvc.utils.compat import str
+from dvc.utils.compat import urlparse
 
 
 # On Python 2.7/Windows sys.getfilesystemencoding() is set to mbcs,

dvc/progress.py

@@ -1,9 +1,12 @@
 """Manages progress bars for dvc repo."""
 from __future__ import print_function
+
 import logging
 import sys
-from tqdm import tqdm
+
 from funcy import merge
+from tqdm import tqdm
+
 from dvc.utils import env2bool
 
 logger = logging.getLogger(__name__)

dvc/prompt.py

@@ -1,10 +1,9 @@
 """Manages user prompts."""
-
-from __future__ import unicode_literals
 from __future__ import print_function
+from __future__ import unicode_literals
 
-import sys
 import logging
+import sys
 from getpass import getpass
 
 from dvc.utils.compat import input

dvc/remote/__init__.py

@@ -1,16 +1,15 @@
 from __future__ import unicode_literals
 
+from .config import RemoteConfig
 from dvc.remote.azure import RemoteAZURE
 from dvc.remote.gs import RemoteGS
 from dvc.remote.hdfs import RemoteHDFS
-from dvc.remote.local import RemoteLOCAL
-from dvc.remote.s3 import RemoteS3
-from dvc.remote.ssh import RemoteSSH
 from dvc.remote.http import RemoteHTTP
 from dvc.remote.https import RemoteHTTPS
+from dvc.remote.local import RemoteLOCAL
 from dvc.remote.oss import RemoteOSS
-
+from dvc.remote.s3 import RemoteS3
-from .config import RemoteConfig
+from dvc.remote.ssh import RemoteSSH
 
 
 REMOTES = [

dvc/remote/azure.py

@@ -1,20 +1,20 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import logging
 import os
 import re
-import logging
+from datetime import datetime
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 from funcy import cached_property
 
-from dvc.scheme import Schemes
-
-from dvc.utils.compat import urlparse
-from dvc.progress import Tqdm
 from dvc.config import Config
-from dvc.remote.base import RemoteBASE
 from dvc.path_info import CloudURLInfo
+from dvc.progress import Tqdm
+from dvc.remote.base import RemoteBASE
+from dvc.scheme import Schemes
+from dvc.utils.compat import urlparse
 
 
 logger = logging.getLogger(__name__)

dvc/remote/base.py

@@ -1,31 +1,34 @@
 from __future__ import unicode_literals
 
-from operator import itemgetter
+import itertools
-from multiprocessing import cpu_count
-
 import json
 import logging
 import tempfile
-import itertools
-from functools import partial
 from concurrent.futures import ThreadPoolExecutor
 from copy import copy
-
+from functools import partial
-from dvc.ignore import DvcIgnore
+from multiprocessing import cpu_count
-from dvc.utils.compat import str, basestring, urlparse, FileNotFoundError
+from operator import itemgetter
-from dvc.remote.slow_link_detection import slow_link_guard
 
 import dvc.prompt as prompt
 from dvc.config import Config
-from dvc.exceptions import (
+from dvc.exceptions import ConfirmRemoveError
-    DvcException,
+from dvc.exceptions import DvcException
-    ConfirmRemoveError,
+from dvc.exceptions import DvcIgnoreInCollectedDirError
-    DvcIgnoreInCollectedDirError,
+from dvc.ignore import DvcIgnore
-)
+from dvc.path_info import PathInfo
+from dvc.path_info import URLInfo
 from dvc.progress import Tqdm
-from dvc.utils import tmp_fname, move, relpath, makedirs
+from dvc.remote.slow_link_detection import slow_link_guard
 from dvc.state import StateNoop
-from dvc.path_info import PathInfo, URLInfo
+from dvc.utils import makedirs
+from dvc.utils import move
+from dvc.utils import relpath
+from dvc.utils import tmp_fname
+from dvc.utils.compat import basestring
+from dvc.utils.compat import FileNotFoundError
+from dvc.utils.compat import str
+from dvc.utils.compat import urlparse
 from dvc.utils.http import open_url
 
 logger = logging.getLogger(__name__)

dvc/remote/config.py

@@ -1,10 +1,11 @@
-import os
 import logging
+import os
 import posixpath
 
+from dvc.config import Config
+from dvc.config import ConfigError
 from dvc.utils import relpath
 from dvc.utils.compat import urlparse
-from dvc.config import Config, ConfigError
 
 
 logger = logging.getLogger(__name__)

dvc/remote/gs.py

@@ -6,12 +6,12 @@ from functools import wraps
 
 from funcy import cached_property
 
-from dvc.utils.compat import FileNotFoundError  # skipcq: PYL-W0622
-from dvc.remote.base import RemoteBASE
 from dvc.config import Config
 from dvc.exceptions import DvcException
 from dvc.path_info import CloudURLInfo
+from dvc.remote.base import RemoteBASE
 from dvc.scheme import Schemes
+from dvc.utils.compat import FileNotFoundError  # skipcq: PYL-W0622
 
 logger = logging.getLogger(__name__)
 

dvc/remote/hdfs.py

@@ -1,21 +1,24 @@
 from __future__ import unicode_literals
 
-import os
-import re
 import io
-import posixpath
 import logging
-from subprocess import Popen, PIPE
+import os
-from contextlib import contextmanager, closing
+import posixpath
+import re
+from contextlib import closing
+from contextlib import contextmanager
+from subprocess import PIPE
+from subprocess import Popen
 
+from .base import RemoteBASE
+from .base import RemoteCmdError
+from .pool import get_connection
 from dvc.config import Config
 from dvc.scheme import Schemes
-
+from dvc.utils import fix_env
-from dvc.utils.compat import urlparse, FileNotFoundError
+from dvc.utils import tmp_fname
-from dvc.utils import fix_env, tmp_fname
+from dvc.utils.compat import FileNotFoundError
-
+from dvc.utils.compat import urlparse
-from .pool import get_connection
-from .base import RemoteBASE, RemoteCmdError
 
 logger = logging.getLogger(__name__)
 

dvc/remote/http.py

@@ -4,12 +4,13 @@ import logging
 
 from funcy import cached_property
 
+from dvc.config import Config
+from dvc.config import ConfigError
+from dvc.exceptions import DvcException
+from dvc.progress import Tqdm
+from dvc.remote.base import RemoteBASE
 from dvc.scheme import Schemes
 from dvc.utils.compat import open
-from dvc.progress import Tqdm
-from dvc.exceptions import DvcException
-from dvc.config import Config, ConfigError
-from dvc.remote.base import RemoteBASE
 
 logger = logging.getLogger(__name__)
 

dvc/remote/https.py

@@ -1,8 +1,7 @@
 from __future__ import unicode_literals
 
-from dvc.scheme import Schemes
-
 from .http import RemoteHTTP
+from dvc.scheme import Schemes
 
 
 class RemoteHTTPS(RemoteHTTP):

dvc/remote/local.py

@@ -1,38 +1,38 @@
 from __future__ import unicode_literals
-import os
+
-import stat
 import errno
 import logging
-from functools import partial
+import os
+import stat
 from concurrent.futures import ThreadPoolExecutor
+from functools import partial
 
 from shortuuid import uuid
 
-from dvc.scheme import Schemes
-from dvc.utils.compat import str, fspath_py35, open
-from dvc.system import System
-from dvc.remote.base import (
-    RemoteBASE,
-    STATUS_MAP,
-    STATUS_NEW,
-    STATUS_DELETED,
-    STATUS_MISSING,
-)
-from dvc.utils import (
-    remove,
-    move,
-    copyfile,
-    tmp_fname,
-    file_md5,
-    walk_files,
-    relpath,
-    makedirs,
-)
 from dvc.config import Config
-from dvc.exceptions import DvcException, DownloadError, UploadError
+from dvc.exceptions import DownloadError
-from dvc.progress import Tqdm
+from dvc.exceptions import DvcException
-
+from dvc.exceptions import UploadError
 from dvc.path_info import PathInfo
+from dvc.progress import Tqdm
+from dvc.remote.base import RemoteBASE
+from dvc.remote.base import STATUS_DELETED
+from dvc.remote.base import STATUS_MAP
+from dvc.remote.base import STATUS_MISSING
+from dvc.remote.base import STATUS_NEW
+from dvc.scheme import Schemes
+from dvc.system import System
+from dvc.utils import copyfile
+from dvc.utils import file_md5
+from dvc.utils import makedirs
+from dvc.utils import move
+from dvc.utils import relpath
+from dvc.utils import remove
+from dvc.utils import tmp_fname
+from dvc.utils import walk_files
+from dvc.utils.compat import fspath_py35
+from dvc.utils.compat import open
+from dvc.utils.compat import str
 
 logger = logging.getLogger(__name__)
 

dvc/remote/oss.py

@@ -1,15 +1,14 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import os
 import logging
-
+import os
-from dvc.scheme import Schemes
 
 from dvc.config import Config
-from dvc.remote.base import RemoteBASE
-from dvc.progress import Tqdm
 from dvc.path_info import CloudURLInfo
+from dvc.progress import Tqdm
+from dvc.remote.base import RemoteBASE
+from dvc.scheme import Schemes
 
 
 logger = logging.getLogger(__name__)

dvc/remote/pool.py

@@ -1,5 +1,6 @@
 from collections import deque
 from contextlib import contextmanager
+
 from funcy import memoize
 
 

dvc/remote/s3.py

@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
-
 from __future__ import unicode_literals
 
-import os
 import logging
+import os
+
 from funcy import cached_property
 
-from dvc.progress import Tqdm
 from dvc.config import Config
-from dvc.remote.base import RemoteBASE
+from dvc.exceptions import DvcException
-from dvc.exceptions import DvcException, ETagMismatchError
+from dvc.exceptions import ETagMismatchError
 from dvc.path_info import CloudURLInfo
+from dvc.progress import Tqdm
+from dvc.remote.base import RemoteBASE
 from dvc.scheme import Schemes
 
 logger = logging.getLogger(__name__)

dvc/remote/slow_link_detection.py

@@ -1,9 +1,10 @@
 import logging
-import time
 import sys
+import time
 from functools import wraps
 
 import colorama
+
 from dvc.config import Config
 
 

dvc/remote/ssh/__init__.py

@@ -1,23 +1,25 @@
 from __future__ import unicode_literals
 
 import errno
-import itertools
-import io
-import os
 import getpass
+import io
+import itertools
 import logging
+import os
 import threading
 from concurrent.futures import ThreadPoolExecutor
-from contextlib import contextmanager, closing
+from contextlib import closing
+from contextlib import contextmanager
 
 import dvc.prompt as prompt
 from dvc.config import Config
-from dvc.utils import to_chunks
-from dvc.utils.compat import urlparse, StringIO
-from dvc.remote.base import RemoteBASE
-from dvc.scheme import Schemes
-from dvc.remote.pool import get_connection
 from dvc.progress import Tqdm
+from dvc.remote.base import RemoteBASE
+from dvc.remote.pool import get_connection
+from dvc.scheme import Schemes
+from dvc.utils import to_chunks
+from dvc.utils.compat import StringIO
+from dvc.utils.compat import urlparse
 
 logger = logging.getLogger(__name__)
 

dvc/remote/ssh/connection.py

@@ -1,8 +1,9 @@
+import errno
+import logging
 import os
 import posixpath
-import logging
-import errno
 import stat
+
 from funcy import cached_property
 
 try:

dvc/repo/__init__.py

@@ -1,26 +1,28 @@
 from __future__ import unicode_literals
 
-import os
 import logging
+import os
 from contextlib import contextmanager
+from functools import wraps
 from itertools import chain
 
-from functools import wraps
 from funcy import cached_property
 
+from .graph import check_acyclic
+from .graph import get_pipeline
+from .graph import get_pipelines
+from .graph import get_stages
 from dvc.config import Config
-from dvc.exceptions import (
+from dvc.exceptions import FileMissingError
-    NotDvcRepoError,
+from dvc.exceptions import NotDvcRepoError
-    OutputNotFoundError,
+from dvc.exceptions import OutputNotFoundError
-    FileMissingError,
-)
 from dvc.ignore import DvcIgnoreFilter
 from dvc.path_info import PathInfo
 from dvc.remote.base import RemoteActionNotImplemented
-from dvc.utils.compat import open as _open, fspath_py35, FileNotFoundError
 from dvc.utils import relpath
-
+from dvc.utils.compat import FileNotFoundError
-from .graph import check_acyclic, get_pipeline, get_pipelines, get_stages
+from dvc.utils.compat import fspath_py35
+from dvc.utils.compat import open as _open
 
 
 logger = logging.getLogger(__name__)

dvc/repo/add.py

@@ -1,16 +1,18 @@
 from __future__ import unicode_literals
 
-import os
 import logging
+import os
+
 import colorama
 from six import string_types
 
-from dvc.repo.scm_context import scm_context
+from . import locked
-from dvc.stage import Stage
-from dvc.utils import walk_files, LARGE_DIR_SIZE
 from dvc.exceptions import RecursiveAddingWhileUsingFilename
 from dvc.progress import Tqdm
-from . import locked
+from dvc.repo.scm_context import scm_context
+from dvc.stage import Stage
+from dvc.utils import LARGE_DIR_SIZE
+from dvc.utils import walk_files
 
 logger = logging.getLogger(__name__)
 

dvc/repo/brancher.py

@@ -1,4 +1,5 @@
 from funcy import group_by
+
 from dvc.scm.tree import WorkingTree
 
 

dvc/repo/checkout.py

@@ -2,7 +2,8 @@ from __future__ import unicode_literals
 
 import logging
 
-from dvc.exceptions import CheckoutErrorSuggestGit, CheckoutError
+from dvc.exceptions import CheckoutError
+from dvc.exceptions import CheckoutErrorSuggestGit
 from dvc.progress import Tqdm
 
 

dvc/repo/diff.py

@@ -3,18 +3,14 @@ from __future__ import unicode_literals
 import os
 from errno import ENOENT
 
-
 import dvc.logger as logger
-from dvc.scm.base import FileNotInCommitError
-from dvc.scm.git import (
-    DIFF_A_TREE,
-    DIFF_B_TREE,
-    DIFF_A_REF,
-    DIFF_B_REF,
-    DIFF_EQUAL,
-)
-
 from . import locked
+from dvc.scm.base import FileNotInCommitError
+from dvc.scm.git import DIFF_A_REF
+from dvc.scm.git import DIFF_A_TREE
+from dvc.scm.git import DIFF_B_REF
+from dvc.scm.git import DIFF_B_TREE
+from dvc.scm.git import DIFF_EQUAL
 
 
 DIFF_TARGET = "target"

dvc/repo/fetch.py

@@ -2,11 +2,12 @@ from __future__ import unicode_literals
 
 import logging
 
-from dvc.config import NoRemoteError
-from dvc.exceptions import DownloadError, OutputNotFoundError
-from dvc.scm.base import CloneError
-from dvc.external_repo import external_repo
 from dvc.cache import NamedCache
+from dvc.config import NoRemoteError
+from dvc.exceptions import DownloadError
+from dvc.exceptions import OutputNotFoundError
+from dvc.external_repo import external_repo
+from dvc.scm.base import CloneError
 
 
 logger = logging.getLogger(__name__)

dvc/repo/gc.py

@@ -2,8 +2,8 @@ from __future__ import unicode_literals
 
 import logging
 
-from dvc.cache import NamedCache
 from . import locked
+from dvc.cache import NamedCache
 
 
 logger = logging.getLogger(__name__)

dvc/repo/get.py

@@ -1,19 +1,19 @@
 import logging
 import os
+
 import shortuuid
 
-from dvc.stage import Stage
 from dvc.config import Config
-from dvc.exceptions import (
+from dvc.exceptions import GetDVCFileError
-    NotDvcRepoError,
+from dvc.exceptions import NotDvcRepoError
-    UrlNotDvcRepoError,
+from dvc.exceptions import OutputNotFoundError
-    GetDVCFileError,
+from dvc.exceptions import UrlNotDvcRepoError
-    OutputNotFoundError,
-)
-from dvc.path_info import PathInfo
 from dvc.external_repo import external_repo
+from dvc.path_info import PathInfo
+from dvc.stage import Stage
 from dvc.state import StateNoop
-from dvc.utils import remove, resolve_output
+from dvc.utils import remove
+from dvc.utils import resolve_output
 
 logger = logging.getLogger(__name__)
 

dvc/repo/get_url.py

@@ -1,8 +1,7 @@
 import os
 
-import dvc.output as output
 import dvc.dependency as dependency
-
+import dvc.output as output
 from dvc.utils import resolve_output
 
 

dvc/repo/imp_url.py

@@ -1,7 +1,6 @@
-from dvc.utils import resolve_output
-from dvc.repo.scm_context import scm_context
-
 from . import locked as locked_repo
+from dvc.repo.scm_context import scm_context
+from dvc.utils import resolve_output
 
 
 @locked_repo

dvc/repo/init.py

@@ -1,13 +1,17 @@
-import os
-import colorama
 import logging
+import os
 
-from dvc.repo import Repo
+import colorama
-from dvc.scm import SCM, NoSCM
+
+from dvc.analytics import Analytics
 from dvc.config import Config
 from dvc.exceptions import InitError
-from dvc.utils import boxify, relpath, remove
+from dvc.repo import Repo
-from dvc.analytics import Analytics
+from dvc.scm import NoSCM
+from dvc.scm import SCM
+from dvc.utils import boxify
+from dvc.utils import relpath
+from dvc.utils import remove
 
 logger = logging.getLogger(__name__)
 

dvc/repo/metrics/modify.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from dvc.repo import locked
 from dvc.exceptions import DvcException
+from dvc.repo import locked
 
 
 @locked

dvc/repo/metrics/show.py

@@ -1,16 +1,20 @@
 from __future__ import unicode_literals
 
-import errno
-import os
 import csv
+import errno
 import json
 import logging
+import os
 
 from jsonpath_ng.ext import parse
 
+from dvc.exceptions import NoMetricsError
+from dvc.exceptions import OutputNotFoundError
 from dvc.repo import locked
-from dvc.exceptions import OutputNotFoundError, NoMetricsError
+from dvc.utils.compat import builtin_str
-from dvc.utils.compat import builtin_str, open, StringIO, csv_reader
+from dvc.utils.compat import csv_reader
+from dvc.utils.compat import open
+from dvc.utils.compat import StringIO
 
 NO_METRICS_FILE_AT_REFERENCE_WARNING = (
     "Metrics file '{}' does not exist at the reference '{}'."

dvc/repo/move.py

@@ -1,10 +1,9 @@
 import os
 
+from . import locked
 from dvc.exceptions import MoveNotDataSourceError
 from dvc.repo.scm_context import scm_context
 
-from . import locked
-
 
 def _expand_target_path(from_path, to_path):
     if os.path.isdir(to_path):

dvc/repo/reproduce.py

@@ -2,13 +2,13 @@ from __future__ import unicode_literals
 
 import logging
 
+from . import locked
+from .graph import get_pipeline
+from .graph import get_pipelines
 from dvc.exceptions import ReproductionError
 from dvc.repo.scm_context import scm_context
 from dvc.utils import relpath
 
-from . import locked
-from .graph import get_pipeline, get_pipelines
-
 
 logger = logging.getLogger(__name__)
 

dvc/repo/status.py

@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 import logging
+
 from funcy.py3 import cat
 
 from . import locked

dvc/scm/__init__.py

@@ -1,5 +1,4 @@
 """Manages source control systems(e.g. Git)."""
-
 from __future__ import unicode_literals
 
 from dvc.scm.base import Base

dvc/scm/base.py

@@ -1,5 +1,4 @@
 """Manages source control systems(e.g. Git) in dvc."""
-
 from __future__ import unicode_literals
 
 import os

dvc/scm/git/__init__.py

@@ -1,24 +1,25 @@
 """Manages Git."""
-
 from __future__ import unicode_literals
 
-import os
 import logging
+import os
 
 from funcy import cached_property
 from pathspec.patterns import GitWildMatchPattern
 
 from dvc.exceptions import GitHookAlreadyExistsError
-from dvc.utils.compat import str, open, cast_bytes_py2
+from dvc.scm.base import Base
-from dvc.utils import fix_env, relpath, is_binary
+from dvc.scm.base import CloneError
-from dvc.scm.base import (
+from dvc.scm.base import FileNotInRepoError
-    Base,
+from dvc.scm.base import RevError
-    SCMError,
+from dvc.scm.base import SCMError
-    FileNotInRepoError,
-    CloneError,
-    RevError,
-)
 from dvc.scm.git.tree import GitTree
+from dvc.utils import fix_env
+from dvc.utils import is_binary
+from dvc.utils import relpath
+from dvc.utils.compat import cast_bytes_py2
+from dvc.utils.compat import open
+from dvc.utils.compat import str
 
 
 logger = logging.getLogger(__name__)

dvc/scm/git/tree.py

@@ -1,11 +1,11 @@
 import errno
 import os
 
-from dvc.utils import relpath
-from dvc.utils.compat import StringIO, BytesIO
 from dvc.exceptions import DvcException
-
 from dvc.scm.tree import BaseTree
+from dvc.utils import relpath
+from dvc.utils.compat import BytesIO
+from dvc.utils.compat import StringIO
 
 
 # see git-fast-import(1)