Skip to content

Commit

Permalink
Test with Windows
Browse files Browse the repository at this point in the history
Signed-off-by: Bernát Gábor <[email protected]>
  • Loading branch information
gaborbernat committed Feb 19, 2024
1 parent 194a908 commit fe28abd
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
6 changes: 5 additions & 1 deletion .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 @@ -49,6 +49,10 @@ jobs:
with codecs.open(os.environ["GITHUB_ENV"], "a", "utf-8") as file_handler:
file_handler.write(env)
shell: python
- name: debug
run: uv --version
- name: debug
run: which uv
- name: setup test suite
run: tox -vv --notest
- name: run test suite
Expand Down
5 changes: 4 additions & 1 deletion src/tox_uv/_installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ def uv(self) -> str:
return str(Path(sys.executable).parent / "uv")

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
6 changes: 4 additions & 2 deletions src/tox_uv/_venv.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,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 str(Path(sys.executable).parent / f"uv{'.exe' if sys.platform == 'win32' else ''}")

@property
def venv_dir(self) -> Path:
Expand All @@ -105,10 +105,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: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ package = wheel
wheel_build_env = .pkg
extras =
test
pass_env =
PATH
set_env =
COVERAGE_FILE = {toxworkdir}{/}.coverage.{envname}
commands =
Expand Down

0 comments on commit fe28abd

Please sign in to comment.