python-discovery 1.5.0__py3-none-any.whl → 1.5.1__py3-none-any.whl

python_discovery/_discovery.py

@@ -4,14 +4,14 @@ import logging
 import os
 import sys
 from contextlib import suppress
+from dataclasses import dataclass
 from pathlib import Path
 from typing import TYPE_CHECKING, Final
 
-from platformdirs import user_data_path
-
 from ._compat import fs_path_id
 from ._py_info import PythonInfo
 from ._py_spec import PythonSpec
+from ._specifier import DC_KW, SimpleVersion
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Generator, Iterable, Iterator, Mapping, Sequence
@@ -199,7 +199,7 @@ def propose_interpreters(
     if spec.path is not None and spec.is_abs:  # pragma: no cover # relative spec.path is never abs
         return
     yield from _propose_from_path(spec, cache, env, tested_exes, all_implementations=all_implementations)
-    yield from _propose_from_uv(cache, env, all_implementations=all_implementations)
+    yield from _propose_from_uv(spec, cache, env, all_implementations=all_implementations)
 
 
 def _propose_explicit(
@@ -262,30 +262,157 @@ def _propose_from_path(
 
 
 def _propose_from_uv(
+    spec: PythonSpec,
     cache: PyInfoCache | None,
     env: Mapping[str, str],
     *,
     all_implementations: bool = False,
 ) -> Generator[tuple[PythonInfo | None, bool], None, None]:
-    if uv_python_dir := os.getenv("UV_PYTHON_INSTALL_DIR"):
-        uv_python_path = Path(uv_python_dir).expanduser()
-    elif xdg_data_home := os.getenv("XDG_DATA_HOME"):
-        uv_python_path = Path(xdg_data_home).expanduser() / "uv" / "python"
+    seen_uv_paths: set[str] = set()
+    for root in _uv_python_roots(env):
+        for install in _uv_installs(root, spec, all_implementations=all_implementations):
+            for exe_path in _uv_executables(install):
+                if (resolved := str(exe_path.resolve())) in seen_uv_paths:
+                    continue
+                seen_uv_paths.add(resolved)
+                if interpreter := PathPythonInfo.from_exe(str(exe_path), cache, raise_on_error=False, env=env):
+                    yield interpreter, True
+                    break  # one install directory holds one interpreter
+
+
+def _uv_python_roots(env: Mapping[str, str]) -> Generator[Path, None, None]:
+    """Yield uv's store roots, legacy first; searching both keeps a stale legacy directory from hiding the live one."""
+    if install_dir := env.get("UV_PYTHON_INSTALL_DIR"):
+        yield Path(install_dir).expanduser()
+        return
+    for state_dir in _uv_state_dirs(env):
+        yield state_dir / "python"
+
+
+def _uv_state_dirs(env: Mapping[str, str]) -> Generator[Path, None, None]:
+    """Yield uv's legacy state directory then its current one, the order uv prefers them in."""
+    windows = sys.platform == "win32"
+    home = Path(env.get("USERPROFILE" if windows else "HOME") or "~").expanduser()
+    if windows:
+        app_data = Path(env["APPDATA"]) if "APPDATA" in env else home / "AppData" / "Roaming"
+        yield app_data / "uv" / "data"
+        yield app_data / "uv"
+        return
+    if sys.platform == "darwin":
+        yield home / "Library" / "Application Support" / "uv"
+    # uv ignores a relative XDG_DATA_HOME, as the XDG specification requires
+    if (xdg_data_home := env.get("XDG_DATA_HOME")) and (xdg := Path(xdg_data_home)).is_absolute():
+        yield xdg / "uv"
     else:
-        uv_python_path = user_data_path("uv") / "python"
+        yield home / ".local" / "share" / "uv"
 
-    patterns: list[str] = ["*/bin/python", "*/python.exe"]
-    if all_implementations:
-        patterns.extend(("*/bin/pypy*", "*/bin/graalpy", "*/pypy*.exe", "*/bin/graalpy.exe"))
-    seen_uv_paths: set[str] = set()
-    for pattern in patterns:
-        for exe_path in uv_python_path.glob(pattern):
-            resolved = str(Path(exe_path).resolve())
-            if resolved in seen_uv_paths:
-                continue
-            seen_uv_paths.add(resolved)
-            if interpreter := PathPythonInfo.from_exe(str(exe_path), cache, raise_on_error=False, env=env):
-                yield interpreter, True
+
+def _uv_installs(root: Path, spec: PythonSpec, *, all_implementations: bool) -> list[_UvInstall]:
+    try:
+        matching = [
+            install
+            for entry in sorted(root.iterdir())
+            if not entry.name.startswith(".")
+            and entry.is_dir()
+            and _uv_install_matches(install := _parse_uv_install(entry), spec, all_implementations=all_implementations)
+        ]
+    except OSError:
+        return []
+    matching.sort(key=_uv_sort_key)  # stable, so equally ranked installs stay in directory name order
+    return matching
+
+
+def _parse_uv_install(path: Path) -> _UvInstall:
+    implementation, _, remainder = path.name.partition("-")
+    version_str, _, variant = remainder.partition("-")[0].partition("+")
+    try:
+        version = SimpleVersion.from_string(version_str)
+    except ValueError:  # not a uv key, but the directory may still hold an interpreter worth probing
+        return _UvInstall(path=path, key=None)
+    variants = variant.split("+")
+    key = _UvKey(
+        implementation=implementation.lower(),
+        version=version,
+        free_threaded="freethreaded" in variants,
+        debug="debug" in variants,
+    )
+    return _UvInstall(path=path, key=key)
+
+
+@dataclass(**DC_KW)
+class _UvKey:
+    """The ``<implementation>-<version>[+<variant>]-<os>-<arch>-<libc>`` name uv gives an install directory."""
+
+    implementation: str
+    version: SimpleVersion
+    free_threaded: bool
+    debug: bool
+
+
+@dataclass(**DC_KW)
+class _UvInstall:
+    path: Path
+    key: _UvKey | None
+
+
+def _uv_install_matches(install: _UvInstall, spec: PythonSpec, *, all_implementations: bool) -> bool:
+    if (key := install.key) is None:
+        return True
+    if spec.implementation is not None:
+        if spec.implementation.lower() != key.implementation:
+            return False
+    elif not all_implementations and key.implementation != "cpython":
+        # uv resolves a bare `3.8` to `cpython-3.8`; on PATH the equivalent probe finds CPython too
+        return False
+    if spec.free_threaded is not None and spec.free_threaded != key.free_threaded:
+        return False
+    if spec.debug is not None and spec.debug != key.debug:
+        return False
+    return _uv_version_matches(key, spec)
+
+
+def _uv_version_matches(key: _UvKey, spec: PythonSpec) -> bool:
+    # GraalPy keys carry the GraalVM version in older uv releases, so only CPython and PyPy state a Python version
+    if key.implementation not in {"cpython", "pypy"}:
+        return True
+    if spec.version_specifier is not None and not spec.version_specifier.contains(str(key.version)):
+        return False
+    return all(req is None or our == req for our, req in zip(key.version.release, (spec.major, spec.minor, spec.micro)))
+
+
+def _uv_sort_key(install: _UvInstall) -> tuple[int, ...]:
+    """Rank like uv does: CPython first, newest version first, default build ahead of free-threaded and debug."""
+    impl_order: Final[tuple[str, ...]] = ("cpython", "pypy", "graalpy", "pyodide")
+    if (key := install.key) is None:
+        return (len(impl_order) + 1,)
+    version = key.version
+    return (
+        impl_order.index(key.implementation) if key.implementation in impl_order else len(impl_order),
+        # uv's minor version links point at a concrete install that moves on upgrade, so report the target instead
+        int(install.path.is_symlink()),
+        -version.major,
+        -version.minor,
+        -version.micro,
+        -{"a": 0, "b": 1, "rc": 2, None: 3}[version.pre_type],
+        -(version.pre_num or 0),
+        int(key.free_threaded),
+        int(key.debug),
+    )
+
+
+def _uv_executables(install: _UvInstall) -> Generator[Path, None, None]:
+    # some distributions unpack into an `install` subdirectory, which uv resolves the same way
+    base = nested if (nested := install.path / "install").is_dir() else install.path
+    for pattern in (
+        "bin/python",
+        "python.exe",
+        "bin/pypy*",
+        "pypy*.exe",
+        "bin/graalpy",
+        "bin/graalpy.exe",
+        "python*t.exe",  # free-threaded Windows builds that ship no python.exe (astral-sh/uv#8298)
+    ):
+        yield from sorted(base.glob(pattern))
 
 
 def get_paths(env: Mapping[str, str]) -> Generator[Path, None, None]:

python_discovery/_specifier.py

@@ -9,7 +9,9 @@ import sys
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Final
 
-_DC_KW = {"frozen": True, "kw_only": True, "slots": True} if sys.version_info >= (3, 10) else {"frozen": True}
+DC_KW: Final[dict[str, bool]] = (
+    {"frozen": True, "kw_only": True, "slots": True} if sys.version_info >= (3, 10) else {"frozen": True}
+)
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
@@ -38,7 +40,7 @@ _SPECIFIER_RE: Final[re.Pattern[str]] = re.compile(
 _PRE_ORDER: Final[dict[str, int]] = {"a": 1, "b": 2, "rc": 3}
 
 
-@dataclass(**_DC_KW)
+@dataclass(**DC_KW)
 class SimpleVersion:
     """
     Simple PEP 440-like version parser using only standard library.
@@ -125,7 +127,7 @@ class SimpleVersion:
         return f"SimpleVersion('{self.version_str}')"
 
 
-@dataclass(**_DC_KW)
+@dataclass(**DC_KW)
 class SimpleSpecifier:
     """
     Simple PEP 440-like version specifier using only standard library.
@@ -247,7 +249,7 @@ class SimpleSpecifier:
         return f"SimpleSpecifier('{self.spec_str}')"
 
 
-@dataclass(**_DC_KW)
+@dataclass(**DC_KW)
 class SimpleSpecifierSet:
     """
     Simple PEP 440-like specifier set using only standard library.
@@ -305,6 +307,7 @@ class SimpleSpecifierSet:
 
 
 __all__ = [
+    "DC_KW",
     "SimpleSpecifier",
     "SimpleSpecifierSet",
     "SimpleVersion",

{python_discovery-1.5.0.dist-info → python_discovery-1.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-discovery
-Version: 1.5.0
+Version: 1.5.1
 Summary: Python interpreter discovery
 Project-URL: Changelog, https://github.com/tox-dev/python-discovery/releases
 Project-URL: Documentation, https://python-discovery.readthedocs.io
@@ -48,7 +48,6 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 Requires-Python: >=3.8
 Requires-Dist: filelock>=3.15.4
-Requires-Dist: platformdirs<5,>=4.3.6
 Description-Content-Type: text/markdown
 
 # [`python-discovery`](https://python-discovery.readthedocs.io/en/latest/)

{python_discovery-1.5.0.dist-info → python_discovery-1.5.1.dist-info}/RECORD

@@ -2,15 +2,15 @@ python_discovery/__init__.py,sha256=Hi4j3pMvC8Fo8KoNL-wOHsPSCUHwY4c0qvv5sjnFzME,
 python_discovery/_cache.py,sha256=svmG2GzUQzd2xTjAbm2eX1CKxxGAglfv4kxaPuxwPIA,5147
 python_discovery/_cached_py_info.py,sha256=l9Y9UJGjKjp4M7iR9HfXYzW3hWdQ3KyNOD5IbSEphLw,8659
 python_discovery/_compat.py,sha256=iqxGuhK9rPaiui80G1H1KrweoMJ16gyLYEmUrSXrp5c,709
-python_discovery/_discovery.py,sha256=HF_TIuH6WLpvHU1KQiK9_yWfJ-np1eB9OSJwI1xRgdc,16894
+python_discovery/_discovery.py,sha256=ABPD8MRweUO6B7cG3U3ZBfUIYs08rh6dYPA225EURyY,22032
 python_discovery/_py_info.py,sha256=sXsOX4epGDRhrLvEcpDThh3r1yKMf5KZVaF2ZegoSOA,37311
 python_discovery/_py_spec.py,sha256=O1RMC9JQ7m5SRzF6cEELxnIWZpadXYWO4bWDD7TemUs,10965
-python_discovery/_specifier.py,sha256=Mu9Wp0tgY3WhXNffsG8Je8K3uc-vxqadEdvvQzWIanA,10416
+python_discovery/_specifier.py,sha256=o7MHb0z_mFSLz9gXqMwJoNkHYjgi2biq3Ibvd0_slvc,10457
 python_discovery/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_discovery/_windows/__init__.py,sha256=qthcyGh36b3WkeSbZ4ECRRYLbCOCaQu5X_DRZ98tXfk,315
 python_discovery/_windows/_pep514.py,sha256=1TqLTdofSCPu3VFE7D4u2fXweyaqhKJR7b48VmJ9AQQ,7787
 python_discovery/_windows/_propose.py,sha256=iMJf6l0TU4SvuV8UsCHHINAe9L5dUT949xyeyMVdong,1565
-python_discovery-1.5.0.dist-info/METADATA,sha256=aDIMeMkRg8kO2fVDwL41lD5DgT_u9Iu8tokFsq-0UPY,5018
-python_discovery-1.5.0.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-python_discovery-1.5.0.dist-info/licenses/LICENSE,sha256=kOJeH68qSq6o2V7o5_VziwUqGswMnFgGgQH5Mahr1Yg,1023
-python_discovery-1.5.0.dist-info/RECORD,,
+python_discovery-1.5.1.dist-info/METADATA,sha256=DWitu_0XNhVQusKTT4aIXioAlImTpg-XH4Yp5ZhHbRc,4980
+python_discovery-1.5.1.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+python_discovery-1.5.1.dist-info/licenses/LICENSE,sha256=kOJeH68qSq6o2V7o5_VziwUqGswMnFgGgQH5Mahr1Yg,1023
+python_discovery-1.5.1.dist-info/RECORD,,