diff options
author | pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> | 2021-05-25 09:03:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-25 09:03:52 +0100 |
commit | 6305f1821eef8eef463ae86eb9ea06e73975dd44 (patch) | |
tree | 1ee9dd906b339313313d1a78ceca13de13051fa5 | |
parent | 2a2a964e33eb7415ff6f6e5daa6797a781d33207 (diff) | |
download | tox-git-6305f1821eef8eef463ae86eb9ea06e73975dd44.tar.gz |
[pre-commit.ci] pre-commit autoupdate (#2068)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Anthony Sottile <asottile@umich.edu>
-rw-r--r-- | .pre-commit-config.yaml | 2 | ||||
-rw-r--r-- | src/tox/_quickstart.py | 6 | ||||
-rw-r--r-- | src/tox/config/__init__.py | 4 | ||||
-rw-r--r-- | src/tox/venv.py | 8 | ||||
-rw-r--r-- | tasks/notify.py | 2 | ||||
-rw-r--r-- | tests/unit/config/test_config.py | 2 |
6 files changed, 11 insertions, 13 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 293c2b12..45e6e36c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/asottile/pyupgrade - rev: v2.16.0 + rev: v2.18.2 hooks: - id: pyupgrade - repo: https://github.com/PyCQA/isort diff --git a/src/tox/_quickstart.py b/src/tox/_quickstart.py index 1c7dfc23..175d9708 100644 --- a/src/tox/_quickstart.py +++ b/src/tox/_quickstart.py @@ -223,8 +223,8 @@ def get_default_deps(commands): def post_process_input(map_): envlist = [env for env in tox.PYTHON.QUICKSTART_PY_ENVS if map_.get(env) is True] map_["envlist"] = ", ".join(envlist) - map_["commands"] = "\n ".join([cmd.strip() for cmd in map_["commands"]]) - map_["deps"] = "\n ".join([dep.strip() for dep in set(map_["deps"])]) + map_["commands"] = "\n ".join(cmd.strip() for cmd in map_["commands"]) + map_["deps"] = "\n ".join(dep.strip() for dep in set(map_["deps"])) def generate(map_): @@ -247,7 +247,7 @@ def generate(map_): def prepare_content(content): - return "\n".join([line.rstrip() for line in content.split("\n")]) + return "\n".join(line.rstrip() for line in content.split("\n")) def parse_args(): diff --git a/src/tox/config/__init__.py b/src/tox/config/__init__.py index 8f03f364..9c699cbd 100644 --- a/src/tox/config/__init__.py +++ b/src/tox/config/__init__.py @@ -1560,7 +1560,7 @@ def _split_env(env): return [] if not isinstance(env, list): env = [e.split("#", 1)[0].strip() for e in env.split("\n")] - env = ",".join([e for e in env if e]) + env = ",".join(e for e in env if e) env = [env] return mapcat(_expand_envstr, env) @@ -1792,7 +1792,7 @@ class SectionReader: if sys.platform.startswith("win"): posargs_string = list2cmdline([x for x in posargs if x]) else: - posargs_string = " ".join([shlex_quote(x) for x in posargs if x]) + posargs_string = " ".join(shlex_quote(x) for x in posargs if x) return posargs_string else: return default or "" diff --git a/src/tox/venv.py b/src/tox/venv.py index e295e5f2..a28fd83e 100644 --- a/src/tox/venv.py +++ b/src/tox/venv.py @@ -527,7 +527,7 @@ class VirtualEnv(object): # happens if the same environment is invoked twice message = "commands[{}] | {}".format( i, - " ".join([pipes.quote(str(x)) for x in argv]), + " ".join(pipes.quote(str(x)) for x in argv), ) action.setactivity(name, message) # check to see if we need to ignore the return code @@ -609,10 +609,8 @@ class VirtualEnv(object): "unresolvable substitution(s):\n {}\n" "Environment variables are missing or defined recursively.".format( "\n ".join( - [ - "{}: '{}'".format(section_key, exc.name) - for section_key, exc in sorted(self.envconfig._missing_subs.items()) - ], + "{}: '{}'".format(section_key, exc.name) + for section_key, exc in sorted(self.envconfig._missing_subs.items()) ), ) ) diff --git a/tasks/notify.py b/tasks/notify.py index d9e48a95..f6f3701a 100644 --- a/tasks/notify.py +++ b/tasks/notify.py @@ -85,7 +85,7 @@ def get_last_release_versions(repo: Repo) -> Tuple[Version, Version]: print("get latest release version") commit_to_tag = {tag.commit.hexsha: tag for tag in repo.tags} _, release_tag = sorted( - [(tag.commit.committed_datetime, tag) for tag in repo.tags], + ((tag.commit.committed_datetime, tag) for tag in repo.tags), reverse=True, )[0] for commit in release_tag.commit.iter_parents(): diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py index 33adc1da..4e481d65 100644 --- a/tests/unit/config/test_config.py +++ b/tests/unit/config/test_config.py @@ -1956,7 +1956,7 @@ class TestConfigTestEnv: frob{{env:ENV_VAR:>1.0,<2.0}} """.format( envlist=",".join(envlist), - deps="\n" + "\n".join([" " * 17 + d for d in deps]), + deps="\n" + "\n".join(" " * 17 + d for d in deps), ) conf = newconfig([], inisource).envconfigs["py27"] packages = [dep.name for dep in conf.deps] |