From 2cf190ae5acc83488a9daef45e51cf964190e66d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 12:25:18 -0700 Subject: [PATCH] [pre-commit.ci] pre-commit autoupdate (#3306) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 6 +++--- src/tox/config/loader/api.py | 2 +- src/tox/config/loader/ini/__init__.py | 2 +- src/tox/config/main.py | 4 ++-- src/tox/execute/local_sub_process/__init__.py | 2 +- src/tox/execute/pep517_backend.py | 2 +- src/tox/pytest.py | 4 ++-- src/tox/tox_env/python/pip/req/file.py | 2 +- .../tox_env/python/virtual_env/package/pyproject.py | 2 +- src/tox/util/spinner.py | 2 +- tests/config/cli/conftest.py | 2 +- tests/config/cli/test_cli_ini.py | 4 ++-- tests/config/conftest.py | 2 +- tests/config/loader/ini/conftest.py | 2 +- tests/config/loader/ini/replace/conftest.py | 2 +- .../loader/ini/replace/test_replace_env_var.py | 2 +- .../loader/ini/replace/test_replace_tox_env.py | 2 +- tests/config/test_set_env.py | 2 +- tests/conftest.py | 4 ++-- tests/journal/test_main_journal.py | 2 +- tests/session/cmd/test_devenv.py | 2 +- tests/session/cmd/test_list_envs.py | 2 +- tests/session/cmd/test_sequential.py | 4 ++-- tests/test_provision.py | 12 ++++++------ .../virtual_env/package/test_package_cmd_builder.py | 2 +- tests/tox_env/python/virtual_env/test_setuptools.py | 2 +- .../python/virtual_env/test_virtualenv_api.py | 2 +- 27 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ae74fcfa7..0ee81e4ff 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.6 + rev: 0.29.1 hooks: - id: check-github-workflows args: [ "--verbose" ] @@ -20,11 +20,11 @@ repos: - id: tox-ini-fmt args: ["-p", "fix"] - repo: https://github.com/tox-dev/pyproject-fmt - rev: "2.1.4" + rev: "2.2.1" hooks: - id: pyproject-fmt - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.5.0" + rev: "v0.5.6" hooks: - id: ruff-format - id: ruff diff --git a/src/tox/config/loader/api.py b/src/tox/config/loader/api.py index a7f35d8f4..84a17c6e1 100644 --- a/src/tox/config/loader/api.py +++ b/src/tox/config/loader/api.py @@ -112,7 +112,7 @@ def __repr__(self) -> str: def __contains__(self, item: str) -> bool: return item in self.found_keys() - def load( # noqa: PLR0913 + def load( self, key: str, of_type: type[V], diff --git a/src/tox/config/loader/ini/__init__.py b/src/tox/config/loader/ini/__init__.py index ae6bd0187..5f0e5eda7 100644 --- a/src/tox/config/loader/ini/__init__.py +++ b/src/tox/config/loader/ini/__init__.py @@ -25,7 +25,7 @@ class IniLoader(StrConvert, Loader[str]): """Load configuration from an ini section (ini file is a string to string dictionary).""" - def __init__( # noqa: PLR0913 + def __init__( self, section: Section, parser: ConfigParser, diff --git a/src/tox/config/main.py b/src/tox/config/main.py index a409aaa0a..6e734191b 100644 --- a/src/tox/config/main.py +++ b/src/tox/config/main.py @@ -22,7 +22,7 @@ class Config: """Main configuration object for tox.""" - def __init__( # noqa: PLR0913 + def __init__( self, config_source: Source, options: Parsed, @@ -123,7 +123,7 @@ def core(self) -> CoreConfigSet: self._core_set = core return core - def get_section_config( # noqa: PLR0913 + def get_section_config( self, section: Section, base: list[str] | None, diff --git a/src/tox/execute/local_sub_process/__init__.py b/src/tox/execute/local_sub_process/__init__.py index c90825d36..2661fc9ab 100644 --- a/src/tox/execute/local_sub_process/__init__.py +++ b/src/tox/execute/local_sub_process/__init__.py @@ -153,7 +153,7 @@ def interrupt(self) -> None: # noqa: PLR6301 class LocalSubProcessExecuteInstance(ExecuteInstance): - def __init__( # noqa: PLR0913 + def __init__( self, request: ExecuteRequest, options: ExecuteOptions, diff --git a/src/tox/execute/pep517_backend.py b/src/tox/execute/pep517_backend.py index 8d8bf8e91..566d66b35 100644 --- a/src/tox/execute/pep517_backend.py +++ b/src/tox/execute/pep517_backend.py @@ -98,7 +98,7 @@ def close(self) -> None: class LocalSubProcessPep517ExecuteInstance(ExecuteInstance): """A backend invocation.""" - def __init__( # noqa: PLR0913 + def __init__( self, request: ExecuteRequest, options: ExecuteOptions, diff --git a/src/tox/pytest.py b/src/tox/pytest.py index d734defdb..2e6648630 100644 --- a/src/tox/pytest.py +++ b/src/tox/pytest.py @@ -194,7 +194,7 @@ def interrupt(self) -> None: # noqa: PLR6301 return None # pragma: no cover class MockExecuteInstance(ExecuteInstance): - def __init__( # noqa: PLR0913 + def __init__( self, request: ExecuteRequest, options: ExecuteOptions, @@ -424,7 +424,7 @@ def _init(files: dict[str, Any], base: Path | None = None, prj_path: Path | None return _init -@pytest.fixture() +@pytest.fixture def empty_project(tox_project: ToxProjectCreator, monkeypatch: pytest.MonkeyPatch) -> ToxProject: project = tox_project({"tox.ini": ""}) monkeypatch.chdir(project.path) diff --git a/src/tox/tox_env/python/pip/req/file.py b/src/tox/tox_env/python/pip/req/file.py index 20f48b126..5581a798e 100644 --- a/src/tox/tox_env/python/pip/req/file.py +++ b/src/tox/tox_env/python/pip/req/file.py @@ -111,7 +111,7 @@ def as_args(self) -> Iterator[str]: class ParsedLine: - def __init__( # noqa: PLR0913 + def __init__( self, filename: str, lineno: int, diff --git a/src/tox/tox_env/python/virtual_env/package/pyproject.py b/src/tox/tox_env/python/virtual_env/package/pyproject.py index ef28a167e..b70fc677c 100644 --- a/src/tox/tox_env/python/virtual_env/package/pyproject.py +++ b/src/tox/tox_env/python/virtual_env/package/pyproject.py @@ -447,7 +447,7 @@ def _send_msg( if self._tox_env.conf["fresh_subprocess"]: self.backend_executor.close() - def _unexpected_response( # noqa: PLR0913 + def _unexpected_response( self, cmd: str, got: Any, diff --git a/src/tox/util/spinner.py b/src/tox/util/spinner.py index d71972db2..e82acaa13 100644 --- a/src/tox/util/spinner.py +++ b/src/tox/util/spinner.py @@ -54,7 +54,7 @@ class Spinner: UNICODE_OUTCOME = Outcome(ok="✔", fail="✖", skip="⚠") ASCII_OUTCOME = Outcome(ok="+", fail="!", skip="?") - def __init__( # noqa: PLR0913 + def __init__( self, enabled: bool = True, # noqa: FBT001, FBT002 refresh_rate: float = 0.1, diff --git a/tests/config/cli/conftest.py b/tests/config/cli/conftest.py index 38fb8a744..d5852bff8 100644 --- a/tests/config/cli/conftest.py +++ b/tests/config/cli/conftest.py @@ -18,7 +18,7 @@ from tox.session.state import State -@pytest.fixture() +@pytest.fixture def core_handlers() -> dict[str, Callable[[State], int]]: return { "config": show_config, diff --git a/tests/config/cli/test_cli_ini.py b/tests/config/cli/test_cli_ini.py index f20185013..82fb7fc95 100644 --- a/tests/config/cli/test_cli_ini.py +++ b/tests/config/cli/test_cli_ini.py @@ -25,7 +25,7 @@ from tox.session.state import State -@pytest.fixture() +@pytest.fixture def default_options() -> dict[str, Any]: return { "colored": "no", @@ -168,7 +168,7 @@ def test_conf_arg(tmp_path: Path, conf_arg: str, filename: str, content: str) -> ) -@pytest.fixture() +@pytest.fixture def exhaustive_ini(tmp_path: Path, monkeypatch: MonkeyPatch) -> Path: to = tmp_path / "tox.ini" to.write_text( diff --git a/tests/config/conftest.py b/tests/config/conftest.py index 6c8d7e350..8cdc9ce19 100644 --- a/tests/config/conftest.py +++ b/tests/config/conftest.py @@ -9,6 +9,6 @@ from tox.config.main import Config -@pytest.fixture() +@pytest.fixture def empty_config(tox_ini_conf: ToxIniCreator) -> Config: return tox_ini_conf("") diff --git a/tests/config/loader/ini/conftest.py b/tests/config/loader/ini/conftest.py index 8d67b72ab..7e056ac46 100644 --- a/tests/config/loader/ini/conftest.py +++ b/tests/config/loader/ini/conftest.py @@ -9,7 +9,7 @@ from pathlib import Path -@pytest.fixture() +@pytest.fixture def mk_ini_conf(tmp_path: Path) -> Callable[[str], ConfigParser]: def _func(raw: str) -> ConfigParser: filename = tmp_path / "demo.ini" diff --git a/tests/config/loader/ini/replace/conftest.py b/tests/config/loader/ini/replace/conftest.py index 673e364ee..05cb0869a 100644 --- a/tests/config/loader/ini/replace/conftest.py +++ b/tests/config/loader/ini/replace/conftest.py @@ -19,7 +19,7 @@ class ReplaceOne(Protocol): def __call__(self, conf: str, pos_args: list[str] | None = None) -> str: ... -@pytest.fixture() +@pytest.fixture def replace_one(tmp_path: Path) -> ReplaceOne: def example(conf: str, pos_args: list[str] | None = None) -> str: tox_ini_file = tmp_path / "tox.ini" diff --git a/tests/config/loader/ini/replace/test_replace_env_var.py b/tests/config/loader/ini/replace/test_replace_env_var.py index dc0db3b54..6c8999f16 100644 --- a/tests/config/loader/ini/replace/test_replace_env_var.py +++ b/tests/config/loader/ini/replace/test_replace_env_var.py @@ -97,7 +97,7 @@ def test_replace_env_var_circular(replace_one: ReplaceOne, monkeypatch: MonkeyPa assert result == "{env:MAGIC}" -@pytest.fixture() +@pytest.fixture def reset_env_var_after_delay(monkeypatch: MonkeyPatch) -> Generator[threading.Thread, None, None]: timeout = 2 diff --git a/tests/config/loader/ini/replace/test_replace_tox_env.py b/tests/config/loader/ini/replace/test_replace_tox_env.py index 564c1a0da..7d89d8cbd 100644 --- a/tests/config/loader/ini/replace/test_replace_tox_env.py +++ b/tests/config/loader/ini/replace/test_replace_tox_env.py @@ -17,7 +17,7 @@ EnvConfigCreator = Callable[[str], ConfigSet] -@pytest.fixture() +@pytest.fixture def example(tox_ini_conf: ToxIniCreator) -> EnvConfigCreator: def func(conf: str) -> ConfigSet: config = tox_ini_conf(f"""[tox]\nenv_list = a\n[testenv]\n{conf}\n""") diff --git a/tests/config/test_set_env.py b/tests/config/test_set_env.py index 5b6def680..63d699fb0 100644 --- a/tests/config/test_set_env.py +++ b/tests/config/test_set_env.py @@ -60,7 +60,7 @@ def __call__( ) -> SetEnv: ... -@pytest.fixture() +@pytest.fixture def eval_set_env(tox_project: ToxProjectCreator) -> EvalSetEnv: def func(tox_ini: str, extra_files: dict[str, Any] | None = None, from_cwd: Path | None = None) -> SetEnv: prj = tox_project({"tox.ini": tox_ini, **(extra_files or {})}) diff --git a/tests/conftest.py b/tests/conftest.py index 65c55b5ea..7a12fbef2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -46,7 +46,7 @@ class ToxIniCreator(Protocol): def __call__(self, conf: str, override: Sequence[Override] | None = None) -> Config: ... -@pytest.fixture() +@pytest.fixture def tox_ini_conf(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> ToxIniCreator: def func(conf: str, override: Sequence[Override] | None = None) -> Config: dest = tmp_path / "c" @@ -78,7 +78,7 @@ def demo_pkg_inline() -> Iterator[Path]: yield demo_path -@pytest.fixture() +@pytest.fixture def patch_prev_py(mocker: MockerFixture) -> Callable[[bool], tuple[str, str]]: def _func(has_prev: bool) -> tuple[str, str]: ver = sys.version_info[0:2] diff --git a/tests/journal/test_main_journal.py b/tests/journal/test_main_journal.py index d8a80b130..eded6b563 100644 --- a/tests/journal/test_main_journal.py +++ b/tests/journal/test_main_journal.py @@ -10,7 +10,7 @@ from tox.journal.main import Journal -@pytest.fixture() +@pytest.fixture def base_info() -> dict[str, Any]: return { "reportversion": "1", diff --git a/tests/session/cmd/test_devenv.py b/tests/session/cmd/test_devenv.py index 4337596ff..c7cd6df9b 100644 --- a/tests/session/cmd/test_devenv.py +++ b/tests/session/cmd/test_devenv.py @@ -15,7 +15,7 @@ def test_devenv_fail_multiple_target(tox_project: ToxProjectCreator) -> None: outcome.assert_out_err(msg, "") -@pytest.mark.integration() +@pytest.mark.integration def test_devenv_ok(tox_project: ToxProjectCreator, enable_pip_pypi_access: str | None) -> None: # noqa: ARG001 content = { "setup.py": "from setuptools import setup\nsetup(name='demo', version='1.0')", diff --git a/tests/session/cmd/test_list_envs.py b/tests/session/cmd/test_list_envs.py index 630c6cd7a..e1266446f 100644 --- a/tests/session/cmd/test_list_envs.py +++ b/tests/session/cmd/test_list_envs.py @@ -8,7 +8,7 @@ from tox.pytest import ToxProject, ToxProjectCreator -@pytest.fixture() +@pytest.fixture def project(tox_project: ToxProjectCreator) -> ToxProject: ini = """ [tox] diff --git a/tests/session/cmd/test_sequential.py b/tests/session/cmd/test_sequential.py index 8bfd8e11e..167397eea 100644 --- a/tests/session/cmd/test_sequential.py +++ b/tests/session/cmd/test_sequential.py @@ -56,7 +56,7 @@ def test_run_sequential_quiet(tox_project: ToxProjectCreator) -> None: assert Matches(r" a: OK \([\d.]+ seconds\)") == reports[-2] -@pytest.mark.integration() +@pytest.mark.integration def test_result_json_sequential( tox_project: ToxProjectCreator, enable_pip_pypi_access: str | None, # noqa: ARG001 @@ -156,7 +156,7 @@ def test_rerun_sequential_wheel(tox_project: ToxProjectCreator, demo_pkg_inline: result_rerun.assert_success() -@pytest.mark.integration() +@pytest.mark.integration def test_rerun_sequential_sdist(tox_project: ToxProjectCreator, demo_pkg_inline: Path) -> None: proj = tox_project( {"tox.ini": "[testenv]\npackage=sdist\ncommands=python -c 'from demo_pkg_inline import do; do()'"}, diff --git a/tests/test_provision.py b/tests/test_provision.py index 2c3d4fcf2..5b2b652b3 100644 --- a/tests/test_provision.py +++ b/tests/test_provision.py @@ -107,7 +107,7 @@ def pypi_index_self(pypi_server: IndexServer, tox_wheels: list[Path], demo_pkg_i return self_index -@pytest.fixture() +@pytest.fixture def _pypi_index_self(pypi_index_self: Index, monkeypatch: MonkeyPatch) -> None: pypi_index_self.use() monkeypatch.setenv("PIP_INDEX_URL", pypi_index_self.url) @@ -127,7 +127,7 @@ def test_provision_requires_nok(tox_project: ToxProjectCreator) -> None: ) -@pytest.mark.integration() +@pytest.mark.integration @pytest.mark.usefixtures("_pypi_index_self") def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) -> None: proj = tox_project({"tox.ini": "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip"}) @@ -160,7 +160,7 @@ def test_provision_requires_ok(tox_project: ToxProjectCreator, tmp_path: Path) - assert f"ROOT: remove tox env folder {provision_env}" in result_recreate.out, result_recreate.out -@pytest.mark.integration() +@pytest.mark.integration @pytest.mark.usefixtures("_pypi_index_self") def test_provision_platform_check(tox_project: ToxProjectCreator) -> None: ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform" @@ -194,7 +194,7 @@ def test_provision_no_recreate_json(tox_project: ToxProjectCreator) -> None: assert requires == {"minversion": None, "requires": ["p", "tox"]} -@pytest.mark.integration() +@pytest.mark.integration @pytest.mark.usefixtures("_pypi_index_self") @pytest.mark.parametrize("plugin_testenv", ["testenv", "testenv:a"]) def test_provision_plugin_runner(tox_project: ToxProjectCreator, tmp_path: Path, plugin_testenv: str) -> None: @@ -217,7 +217,7 @@ def test_provision_plugin_runner(tox_project: ToxProjectCreator, tmp_path: Path, assert prov_msg in result_label.out -@pytest.mark.integration() +@pytest.mark.integration def test_provision_plugin_runner_in_provision(tox_project: ToxProjectCreator, tmp_path: Path) -> None: """Ensure that provision environment can be explicitly configured.""" log = tmp_path / "out.log" @@ -226,7 +226,7 @@ def test_provision_plugin_runner_in_provision(tox_project: ToxProjectCreator, tm proj.run("r", "-e", "py", "--result-json", str(log)) -@pytest.mark.integration() +@pytest.mark.integration @pytest.mark.usefixtures("_pypi_index_self") @pytest.mark.parametrize("relative_path", [True, False], ids=["relative", "absolute"]) def test_provision_conf_file(tox_project: ToxProjectCreator, tmp_path: Path, relative_path: bool) -> None: diff --git a/tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py b/tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py index 54ca54ca3..05af7b184 100644 --- a/tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py +++ b/tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py @@ -45,7 +45,7 @@ def pkg_with_sdist( return next(dist.iterdir()) -@pytest.fixture() +@pytest.fixture def pkg_with_extras_project_sdist( pkg_with_extras_project: Path, pkg_builder: Callable[[Path, Path, list[str], bool], Path], diff --git a/tests/tox_env/python/virtual_env/test_setuptools.py b/tests/tox_env/python/virtual_env/test_setuptools.py index 359ff89ca..3c11938a3 100644 --- a/tests/tox_env/python/virtual_env/test_setuptools.py +++ b/tests/tox_env/python/virtual_env/test_setuptools.py @@ -16,7 +16,7 @@ from tox.pytest import ToxProjectCreator -@pytest.mark.integration() +@pytest.mark.integration def test_setuptools_package( tox_project: ToxProjectCreator, demo_pkg_setuptools: Path, diff --git a/tests/tox_env/python/virtual_env/test_virtualenv_api.py b/tests/tox_env/python/virtual_env/test_virtualenv_api.py index 277bcf1fb..215f7ed96 100644 --- a/tests/tox_env/python/virtual_env/test_virtualenv_api.py +++ b/tests/tox_env/python/virtual_env/test_virtualenv_api.py @@ -16,7 +16,7 @@ from tox.pytest import MonkeyPatch, ToxProject, ToxProjectCreator -@pytest.fixture() +@pytest.fixture def virtualenv_opt(monkeypatch: MonkeyPatch, mocker: MockerFixture) -> VirtualEnvOptions: for key in os.environ: if key.startswith("VIRTUALENV_"): # pragma: no cover