Skip to content

Commit

Permalink
Support Windows and enable verbose mode in uv with more than two verb…
Browse files Browse the repository at this point in the history
…ose flag

Signed-off-by: Bernát Gábor <[email protected]>
  • Loading branch information
gaborbernat committed Feb 19, 2024
1 parent 194a908 commit 63461ec
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- "3.8"
os:
- ubuntu-latest
# - windows-latest # not yet supported
- windows-latest
- macos-latest
steps:
- name: setup python for tox
Expand All @@ -50,7 +50,7 @@ jobs:
file_handler.write(env)
shell: python
- name: setup test suite
run: tox -vv --notest
run: tox -vvv --notest
- name: run test suite
run: tox --skip-pkg-install

Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ repos:
rev: "1.7.0"
hooks:
- id: pyproject-fmt
additional_dependencies: ["tox>=4.12.1"]
additional_dependencies: ["tox>=4.13"]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.2.1"
rev: "v0.2.2"
hooks:
- id: ruff-format
- id: ruff
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dynamic = [
]
dependencies = [
"tox<5,>=4.13",
"uv<1,>=0.1.2",
"uv<1,>=0.1.4",
]
optional-dependencies.test = [
"covdefaults>=2.3",
Expand Down
10 changes: 6 additions & 4 deletions src/tox_uv/_installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
from __future__ import annotations

import logging
import sys
from collections import defaultdict
from pathlib import Path
from typing import TYPE_CHECKING, Any, Sequence, cast

from packaging.requirements import Requirement
Expand All @@ -16,6 +14,7 @@
from tox.tox_env.python.package import EditableLegacyPackage, EditablePackage, SdistPackage, WheelPackage
from tox.tox_env.python.pip.pip_install import Pip
from tox.tox_env.python.pip.req_file import PythonDeps
from uv.__main__ import find_uv_bin # noqa: PLC2701

if TYPE_CHECKING:
from tox.config.main import Config
Expand All @@ -33,10 +32,13 @@ def _register_config(self) -> None:

@property
def uv(self) -> str:
return str(Path(sys.executable).parent / "uv")
return find_uv_bin()

def default_install_command(self, conf: Config, env_name: str | None) -> Command: # noqa: ARG002
return Command([self.uv, "pip", "install", "{opts}", "{packages}"])
cmd = [self.uv, "pip", "install", "{opts}", "{packages}"]
if self._env.options.verbosity > 2: # noqa: PLR2004
cmd.append("-v")
return Command(cmd)

def post_process_install_command(self, cmd: Command) -> Command:
install_command = cmd.args
Expand Down
7 changes: 5 additions & 2 deletions src/tox_uv/_venv.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from tox.execute.local_sub_process import LocalSubProcessExecutor
from tox.execute.request import StdinSource
from tox.tox_env.python.api import Python, PythonInfo, VersionInfo
from uv.__main__ import find_uv_bin # noqa: PLC2701
from virtualenv.discovery.py_spec import PythonSpec

from ._installer import UvInstaller
Expand Down Expand Up @@ -90,7 +91,7 @@ def _get_python(self, base_python: list[str]) -> PythonInfo | None: # noqa: PLR

@property
def uv(self) -> str:
return str(Path(sys.executable).parent / "uv")
return find_uv_bin()

@property
def venv_dir(self) -> Path:
Expand All @@ -105,10 +106,12 @@ def environment_variables(self) -> dict[str, str]:
def create_python_env(self) -> None:
base = self.base_python
cmd = [self.uv, "venv", "-p", base.version_dot]
if self.options.verbosity > 2: # noqa: PLR2004
cmd.append("-v")
if self.conf["uv_seed"]:
cmd.append("--seed")
cmd.append(str(self.venv_dir))
outcome = self.execute(cmd, stdin=StdinSource.OFF, run_id="venv", show=False)
outcome = self.execute(cmd, stdin=StdinSource.OFF, run_id="venv", show=None)
outcome.assert_success()

@property
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ commands =
description = run static analysis and style check using flake8
skip_install = true
deps =
pre-commit>=3.6.1
pre-commit>=3.6.2
pass_env =
HOMEPATH
PROGRAMDATA
Expand Down

0 comments on commit 63461ec

Please sign in to comment.