diff options
author | Bernát Gábor <gaborjbernat@gmail.com> | 2019-03-08 18:12:45 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-08 18:12:45 +0000 |
commit | d21b14de2ad670ad29479cc6fc4f26483c157974 (patch) | |
tree | b5c1763940bfd550637b8e0c51f1162845faa8d5 /src | |
parent | e189e5a5821d7e3ec2066d4621fa2b411a97c1d8 (diff) | |
download | tox-git-d21b14de2ad670ad29479cc6fc4f26483c157974.tar.gz |
upgrade linters (#1182)
Diffstat (limited to 'src')
-rw-r--r-- | src/tox/__init__.py | 2 | ||||
-rw-r--r-- | src/tox/config/__init__.py | 4 | ||||
-rw-r--r-- | src/tox/package/__init__.py | 3 | ||||
-rw-r--r-- | src/tox/package/builder/__init__.py | 2 | ||||
-rw-r--r-- | src/tox/session/__init__.py | 5 | ||||
-rw-r--r-- | src/tox/util/__init__.py | 1 |
6 files changed, 11 insertions, 6 deletions
diff --git a/src/tox/__init__.py b/src/tox/__init__.py index 3e0e2b28..b3df3d5f 100644 --- a/src/tox/__init__.py +++ b/src/tox/__init__.py @@ -29,4 +29,4 @@ __all__ = ( hookimpl = pluggy.HookimplMarker("tox") # NOTE: must come last due to circular import -from .session import cmdline # noqa +from .session import cmdline # isort:skip diff --git a/src/tox/config/__init__.py b/src/tox/config/__init__.py index 66612581..89aab192 100644 --- a/src/tox/config/__init__.py +++ b/src/tox/config/__init__.py @@ -21,7 +21,9 @@ import toml import tox from tox.constants import INFO from tox.interpreters import Interpreters, NoInterpreterInfo -from .parallel import add_parallel_flags, ENV_VAR_KEY as PARALLEL_ENV_VAR_KEY, add_parallel_config + +from .parallel import ENV_VAR_KEY as PARALLEL_ENV_VAR_KEY +from .parallel import add_parallel_config, add_parallel_flags from .reporter import add_verbosity_commands hookimpl = tox.hookimpl diff --git a/src/tox/package/__init__.py b/src/tox/package/__init__.py index ab6fd74e..e3bc1957 100644 --- a/src/tox/package/__init__.py +++ b/src/tox/package/__init__.py @@ -1,11 +1,12 @@ import py import tox +from tox.reporter import error, info, verbosity0, verbosity2, warning from tox.util.lock import get as hold_lock + from .builder import build_package from .local import resolve_package from .view import create_session_view -from tox.reporter import verbosity0, info, error, warning, verbosity2 @tox.hookimpl diff --git a/src/tox/package/builder/__init__.py b/src/tox/package/builder/__init__.py index d8c593f4..11a06574 100644 --- a/src/tox/package/builder/__init__.py +++ b/src/tox/package/builder/__init__.py @@ -1,5 +1,5 @@ -from .legacy import make_sdist from .isolated import build +from .legacy import make_sdist def build_package(config, session): diff --git a/src/tox/session/__init__.py b/src/tox/session/__init__.py index 531e6f78..3b36f1c9 100644 --- a/src/tox/session/__init__.py +++ b/src/tox/session/__init__.py @@ -16,22 +16,23 @@ import py import tox from tox import reporter +from tox.action import Action from tox.config import parseconfig from tox.config.parallel import ENV_VAR_KEY as PARALLEL_ENV_VAR_KEY from tox.config.parallel import OFF_VALUE as PARALLEL_OFF from tox.logs.result import ResultLog +from tox.reporter import update_default_reporter from tox.util import set_os_env_var from tox.util.graph import stable_topological_sort from tox.util.path import ensure_empty_dir from tox.venv import VirtualEnv -from tox.action import Action + from .commands.help import show_help from .commands.help_ini import show_help_ini from .commands.run.parallel import run_parallel from .commands.run.sequential import run_sequential from .commands.show_config import show_config from .commands.show_env import show_envs -from tox.reporter import update_default_reporter def cmdline(args=None): diff --git a/src/tox/util/__init__.py b/src/tox/util/__init__.py index f0acbf67..c72dea0f 100644 --- a/src/tox/util/__init__.py +++ b/src/tox/util/__init__.py @@ -1,4 +1,5 @@ from __future__ import absolute_import, unicode_literals + import os from contextlib import contextmanager |