From 1e4624b290e91955149583b3ca173722410d6190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= Date: Fri, 11 Oct 2024 09:30:40 -0700 Subject: [PATCH] Fix verbosity flag also passed with single verbose flag to tox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bernát Gábor --- src/tox_uv/_installer.py | 2 +- src/tox_uv/_run_lock.py | 2 +- src/tox_uv/_venv.py | 2 +- tests/test_tox_uv_lock.py | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/tox_uv/_installer.py b/src/tox_uv/_installer.py index 78fbfbe..c1f53c2 100644 --- a/src/tox_uv/_installer.py +++ b/src/tox_uv/_installer.py @@ -56,7 +56,7 @@ def uv_resolution_post_process(value: str) -> str: def default_install_command(self, conf: Config, env_name: str | None) -> Command: # noqa: ARG002 cmd = [self.uv, "pip", "install", "{opts}", "{packages}"] - if self._env.options.verbosity > 2: # noqa: PLR2004 + if self._env.options.verbosity > 3: # noqa: PLR2004 cmd.append("-v") return Command(cmd) diff --git a/src/tox_uv/_run_lock.py b/src/tox_uv/_run_lock.py index b7721bb..7f6582b 100644 --- a/src/tox_uv/_run_lock.py +++ b/src/tox_uv/_run_lock.py @@ -56,7 +56,7 @@ def _setup_env(self) -> None: install_pkg = getattr(self.options, "install_pkg", None) if install_pkg is not None: cmd.append("--no-install-project") - if self.options.verbosity > 2: # noqa: PLR2004 + if self.options.verbosity > 3: # noqa: PLR2004 cmd.append("-v") outcome = self.execute(cmd, stdin=StdinSource.OFF, run_id="uv-sync", show=self.options.verbosity > 1) outcome.assert_success() diff --git a/src/tox_uv/_venv.py b/src/tox_uv/_venv.py index 7a74c5d..0412c99 100644 --- a/src/tox_uv/_venv.py +++ b/src/tox_uv/_venv.py @@ -186,7 +186,7 @@ def create_python_env(self) -> None: version_spec = f"{uv_imp or ''}{base.major}.{base.minor}" if base.minor else f"{uv_imp or ''}{base.major}" cmd: list[str] = [self.uv, "venv", "-p", version_spec, "--allow-existing"] - if self.options.verbosity > 2: # noqa: PLR2004 + if self.options.verbosity > 3: # noqa: PLR2004 cmd.append("-v") if self.conf["uv_seed"]: cmd.append("--seed") diff --git a/tests/test_tox_uv_lock.py b/tests/test_tox_uv_lock.py index fb20f6b..2c584f9 100644 --- a/tests/test_tox_uv_lock.py +++ b/tests/test_tox_uv_lock.py @@ -40,8 +40,8 @@ def test_uv_lock_list_dependencies_command(tox_project: ToxProjectCreator) -> No assert calls == expected -@pytest.mark.parametrize("verbose", [True, False]) -def test_uv_lock_command(tox_project: ToxProjectCreator, verbose: bool) -> None: +@pytest.mark.parametrize("verbose", ["", "-v", "-vv", "-vvv"]) +def test_uv_lock_command(tox_project: ToxProjectCreator, verbose: str) -> None: project = tox_project({ "tox.ini": """ [testenv] @@ -53,12 +53,12 @@ def test_uv_lock_command(tox_project: ToxProjectCreator, verbose: bool) -> None: """ }) execute_calls = project.patch_execute(lambda r: 0 if r.run_id != "venv" else None) - result = project.run(*["-vv"] if verbose else []) + result = project.run(*[verbose] if verbose else []) result.assert_success() calls = [(i[0][0].conf.name, i[0][3].run_id, i[0][3].cmd) for i in execute_calls.call_args_list] uv = find_uv_bin() - v_args = ["-v"] if verbose else [] + v_args = ["-v"] if verbose not in {"", "-v"} else [] expected = [ ( "py",