Fix base python conflict (#77)

Author: gaborbernat

.github/SECURITY.md

@@ -3,7 +3,7 @@
 ## Supported Versions
 
 | Version | Supported          |
-|---------| ------------------ |
+| ------- | ------------------ |
 | 1.0.0 + | :white_check_mark: |
 | < 1.0.0 | :x:                |
 

.github/workflows/check.yml

@@ -30,9 +30,9 @@ jobs:
           - windows-latest
           - macos-latest
         include:
-           - { os: ubuntu-latest, py: "pypy3.10" }
-           - { os: ubuntu-latest, py: "pypy3.8" }
-           - { os: windows-latest, py: "pypy3.10" }
+          - { os: ubuntu-latest, py: "pypy3.10" }
+          - { os: ubuntu-latest, py: "pypy3.8" }
+          - { os: windows-latest, py: "pypy3.10" }
     steps:
       - name: setup python for tox
         uses: actions/setup-python@v5

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
     rev: 0.29.1
     hooks:
       - id: check-github-workflows
-        args: [ "--verbose" ]
+        args: ["--verbose"]
   - repo: https://github.com/codespell-project/codespell
     rev: v2.3.0
     hooks:
@@ -24,11 +24,18 @@ repos:
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.5.5"
+    rev: "v0.5.7"
     hooks:
       - id: ruff-format
       - id: ruff
         args: ["--fix", "--unsafe-fixes", "--exit-non-zero-on-fix"]
+  - repo: https://github.com/rbubley/mirrors-prettier
+    rev: "v3.3.3" # Use the sha / tag you want to point at
+    hooks:
+      - id: prettier
+        additional_dependencies:
+          - [email protected]
+          - "@prettier/[email protected]"
   - repo: meta
     hooks:
       - id: check-hooks-apply

pyproject.toml

@@ -42,9 +42,9 @@ dynamic = [
 dependencies = [
   "importlib-resources>=6.4; python_version<'3.9'",
   "packaging>=24.1",
-  "tox<5,>=4.16",
+  "tox<5,>=4.18",
   "typing-extensions>=4.12.2; python_version<'3.10'",
-  "uv<1,>=0.2.33",
+  "uv<1,>=0.2.35",
 ]
 optional-dependencies.test = [
   "covdefaults>=2.3",
@@ -90,6 +90,7 @@ lint.ignore = [
   "D212",   # `multi-line-summary-first-line` (D212) and `multi-line-summary-second-line` (D213) are incompatible
   "D301",   #  Use `r"""` if any backslashes in a docstring
   "D401",   # First line of docstring should be in imperative mood
+  "DOC201", # no support for sphinx
   "ISC001", # Conflict with formatter
   "S104",   # Possible binding to all interface
 ]

src/tox_uv/_venv.py

@@ -3,17 +3,9 @@
 from __future__ import annotations
 
 import json
-import os
 import sys
 from abc import ABC
 from functools import cached_property
-
-if sys.version_info >= (3, 9):  # pragma: no cover (py39+)
-    from importlib.resources import as_file, files
-else:  # pragma: no cover (py38+)
-    from importlib_resources import as_file, files
-
-
 from pathlib import Path
 from platform import python_implementation
 from typing import TYPE_CHECKING, Any, Literal, Optional, Type, cast
@@ -22,18 +14,21 @@
 from tox.execute.request import StdinSource
 from tox.tox_env.errors import Skip
 from tox.tox_env.python.api import Python, PythonInfo, VersionInfo
+from tox.tox_env.python.virtual_env.api import VirtualEnv
+from uv import find_uv_bin
+from virtualenv.discovery.py_spec import PythonSpec
+
+from ._installer import UvInstaller
 
 if sys.version_info >= (3, 10):  # pragma: no cover (py310+)
     from typing import TypeAlias
 else:  # pragma: no cover (<py310)
     from typing_extensions import TypeAlias
 
-from uv import find_uv_bin
-from virtualenv import app_data
-from virtualenv.discovery import cached_py_info
-from virtualenv.discovery.py_spec import PythonSpec
-
-from ._installer import UvInstaller
+if sys.version_info >= (3, 9):  # pragma: no cover (py39+)
+    from importlib.resources import as_file, files
+else:  # pragma: no cover (py38+)
+    from importlib_resources import as_file, files
 
 if TYPE_CHECKING:
     from tox.execute.api import Execute
@@ -64,8 +59,7 @@ def register_config(self) -> None:
             default=False,
             desc="add seed packages to the created venv",
         )
-        # The cast(...) might seems superfluous but removing it
-        # makes mypy crash. The problem is probably on tox's typing side
+        # The cast(...) might seems superfluous but removing it makes mypy crash. The problem isy on tox typing side.
         self.conf.add_config(
             keys=["uv_python_preference"],
             of_type=cast(Type[Optional[PythonPreference]], Optional[PythonPreference]),
@@ -102,8 +96,7 @@ def installer(self) -> Installer[Any]:
     def runs_on_platform(self) -> str:
         return sys.platform
 
-    @staticmethod
-    def _get_python(base_python: list[str]) -> PythonInfo | None:
+    def _get_python(self, base_python: list[str]) -> PythonInfo | None:  # noqa: PLR6301
         for base in base_python:  # pragma: no branch
             if base == sys.executable:
                 version_info = sys.version_info
@@ -121,10 +114,9 @@ def _get_python(base_python: list[str]) -> PythonInfo | None:
                     platform=sys.platform,
                     extra={},
                 )
-            if Path(base).is_absolute():
-                info = cached_py_info.from_exe(
-                    cached_py_info.PythonInfo, app_data.make_app_data(None, read_only=False, env=os.environ), base
-                )
+            base_path = Path(base)
+            if base_path.is_absolute():
+                info = VirtualEnv.get_virtualenv_py_info(base_path)
                 return PythonInfo(
                     implementation=info.implementation,
                     version_info=VersionInfo(*info.version_info),
@@ -151,6 +143,16 @@ def _get_python(base_python: list[str]) -> PythonInfo | None:
 
         return None  # pragma: no cover
 
+    @classmethod
+    def python_spec_for_path(cls, path: Path) -> PythonSpec:
+        """
+        Get the spec for an absolute path to a Python executable.
+
+        :param path: the path investigated
+        :return: the found spec
+        """
+        return VirtualEnv.python_spec_for_path(path)
+
     @property
     def uv(self) -> str:
         return find_uv_bin()

tests/test_tox_uv_venv.py

@@ -105,17 +105,6 @@ def test_uv_venv_spec_abs_path_conflict_impl(
     assert f"failed with env name {env} conflicting with base python {other_interpreter_exe}" in result.out
 
 
-def test_uv_venv_spec_abs_path_conflict_platform(
-    tox_project: ToxProjectCreator, other_interpreter_exe: pathlib.Path
-) -> None:
-    ver = sys.version_info
-    env = f"py{ver.major}{ver.minor}-linux" if sys.platform == "win32" else f"py{ver.major}{ver.minor}-win32"
-    project = tox_project({"tox.ini": f"[testenv:{env}]\npackage=skip\nbase_python={other_interpreter_exe}"})
-    result = project.run("-vv", "-e", env)
-    result.assert_failed()
-    assert f"failed with env name {env} conflicting with base python {other_interpreter_exe}" in result.out
-
-
 def test_uv_venv_na(tox_project: ToxProjectCreator) -> None:
     # skip_missing_interpreters is true by default
     project = tox_project({"tox.ini": "[testenv]\npackage=skip\nbase_python=1.0"})