python-discovery 1.4.0__tar.gz → 1.4.1__tar.gz

{python_discovery-1.4.0 → python_discovery-1.4.1}/.github/workflows/check.yaml

@@ -34,12 +34,12 @@ jobs:
           - dev
           - pkg_meta
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
         with:
           fetch-depth: 0
           persist-credentials: false
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
+        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
         with:
           enable-cache: false
           cache-dependency-glob: "pyproject.toml"

{python_discovery-1.4.0 → python_discovery-1.4.1}/.github/workflows/prepare-release.yaml

@@ -26,14 +26,14 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
         with:
           fetch-depth: 0
           token: ${{ secrets.RELEASE_PAT }}
           persist-credentials: true
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
+        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
         with:
           enable-cache: true
           cache-dependency-glob: "pyproject.toml"

{python_discovery-1.4.0 → python_discovery-1.4.1}/.github/workflows/release.yaml

@@ -13,12 +13,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
         with:
           fetch-depth: 0
           persist-credentials: false
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
+        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
         with:
           enable-cache: false
           cache-dependency-glob: "pyproject.toml"

{python_discovery-1.4.0 → python_discovery-1.4.1}/.pre-commit-config.yaml

@@ -15,11 +15,11 @@ repos:
       - id: codespell
         additional_dependencies: ["tomli>=2.4"]
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "v2.21.2"
+    rev: "v2.23.0"
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.15.14"
+    rev: "v0.15.16"
     hooks:
       - id: ruff-format
       - id: ruff

{python_discovery-1.4.0 → python_discovery-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-discovery
-Version: 1.4.0
+Version: 1.4.1
 Summary: Python interpreter discovery
 Project-URL: Changelog, https://github.com/tox-dev/python-discovery/releases
 Project-URL: Documentation, https://python-discovery.readthedocs.io

{python_discovery-1.4.0 → python_discovery-1.4.1}/docs/changelog.rst

@@ -6,6 +6,16 @@
 
 .. towncrier release notes start
 
+********************
+ v1.4.1 (2026-06-11)
+********************
+
+Bug fixes - 1.4.1
+=================
+- Resolve executable-only symlinks when computing ``system_executable``, mirroring CPython's ``getpath.realpath``
+  (python/cpython#115237): a symlink to the interpreter binary now resolves to the real interpreter, while a fully
+  symlinked interpreter tree is kept as-is - by :user:`gaborbernat`. (:issue:`84`)
+
 ********************
  v1.4.0 (2026-05-28)
 ********************

{python_discovery-1.4.0 → python_discovery-1.4.1}/src/python_discovery/_py_info.py

@@ -204,7 +204,7 @@ class PythonInfo:  # noqa: PLR0904
         # if we're not in a virtual environment, this is already a system python, so return the original executable
         # note we must choose the original and not the pure executable as shim scripts might throw us off
         if not (self.real_prefix or (self.base_prefix is not None and self.base_prefix != self.prefix)):
-            return self.original_executable
+            return self._resolve_executable_symlink(self.original_executable)
 
         # if this is NOT a virtual environment, can't determine easily, bail out
         if self.real_prefix is not None:
@@ -220,11 +220,34 @@ class PythonInfo:  # noqa: PLR0904
 
         # We're not in a venv and base_executable exists; use it directly
         if os.path.exists(base_executable):  # pragma: >=3.11 cover
-            return base_executable
+            return self._resolve_executable_symlink(base_executable)
 
         # Try fallback for POSIX virtual environments
         return self._try_posix_fallback_executable(base_executable)  # pragma: >=3.11 cover
 
+    def _resolve_executable_symlink(self, path: str) -> str:
+        """
+        Resolve symlinks of the executable itself, but never of its parent directories.
+
+        Mirrors CPython's ``getpath.realpath`` (and ``venv`` in python/cpython#115237): an executable-only symlink
+        resolves to the real interpreter so its home can be located, while a fully symlinked interpreter tree is
+        kept as-is.
+        """
+        result = os.path.abspath(path)
+        if self.os != "posix":  # CPython only does this where HAVE_READLINK
+            return result
+        real_path = os.path.realpath(result)
+        if not os.path.exists(real_path):  # symlink loop or broken symlink
+            return result
+        while os.path.islink(result):
+            link = os.readlink(result)
+            candidate = link if os.path.isabs(link) else os.path.normpath(os.path.join(os.path.dirname(result), link))
+            # normpath through a symlinked directory may point at a different file - stop resolving there
+            if not (os.path.exists(candidate) and os.path.samefile(real_path, candidate)):
+                return result
+            result = candidate
+        return result
+
     def _try_posix_fallback_executable(self, base_executable: str) -> str | None:
         """Find a versioned Python binary as fallback for POSIX virtual environments."""
         major, minor = self.version_info.major, self.version_info.minor

{python_discovery-1.4.0 → python_discovery-1.4.1}/tests/test_discovery.py

@@ -431,16 +431,15 @@ def test_predicate_none_is_noop(session_cache: DiskCache) -> None:
 def test_predicate_with_fallback_specs(session_cache: DiskCache) -> None:
     current = PythonInfo.current_system(session_cache)
     major, minor = current.version_info.major, current.version_info.minor
-    accepted_exe: str | None = None
+    proposed: list[str] = []
 
     def reject_first(info: PythonInfo) -> bool:
-        nonlocal accepted_exe
-        if accepted_exe is None:
-            accepted_exe = str(info.executable)
-            return False
-        return True
+        proposed.append(str(info.executable))
+        return len(proposed) > 1
 
     result = get_interpreter([f"{major}.{minor}", sys.executable], [], session_cache, predicate=reject_first)
-    assert accepted_exe is not None
+    # rejecting the first proposal must not abort discovery; a later proposal (same or fallback spec) is accepted -
+    # on hosts where every alias resolves to one interpreter the fallback re-proposes it, so executables may match
     assert result is not None
-    assert str(result.executable) != accepted_exe
+    assert len(proposed) > 1
+    assert str(result.executable) == proposed[-1]

{python_discovery-1.4.0 → python_discovery-1.4.1}/tests/test_py_info_extra.py

@@ -19,6 +19,8 @@ except ImportError:  # pragma: no cover
     tk = None  # type: ignore[assignment]
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from pytest_mock import MockerFixture
 
 CURRENT = PythonInfo.current_system()
@@ -71,7 +73,9 @@ def test_fast_get_system_executable_not_venv() -> None:
     info = PythonInfo()
     info.real_prefix = None
     info.base_prefix = info.prefix
-    assert info._fast_get_system_executable() == info.original_executable
+    result = info._fast_get_system_executable()
+    assert result is not None
+    assert Path(result).samefile(info.original_executable)
 
 
 def test_fast_get_system_executable_real_prefix() -> None:
@@ -96,6 +100,105 @@ def test_fast_get_system_executable_same_as_current(mocker: MockerFixture) -> No
     assert info._fast_get_system_executable() is None
 
 
+@pytest.fixture
+def posix_info() -> PythonInfo:
+    info = PythonInfo()
+    info.os = "posix"
+    return info
+
+
+def test_resolve_executable_symlink_not_posix() -> None:
+    info = PythonInfo()
+    info.os = "nt"
+    assert info._resolve_executable_symlink("/some/python") == str(Path("/some/python").resolve())
+
+
+def _layout_regular_file(tmp_path: Path) -> tuple[Path, Path]:
+    exe = tmp_path / "python"
+    exe.touch()
+    return exe, exe
+
+
+def _layout_broken_symlink(tmp_path: Path) -> tuple[Path, Path]:
+    link = tmp_path / "python"
+    link.symlink_to(tmp_path / "missing")
+    return link, link
+
+
+def _layout_absolute_symlink(tmp_path: Path) -> tuple[Path, Path]:
+    exe = tmp_path / "install" / "bin" / "python3.12"
+    exe.parent.mkdir(parents=True)
+    exe.touch()
+    link = tmp_path / "symdir" / "python3"
+    link.parent.mkdir()
+    link.symlink_to(exe)
+    return link, exe
+
+
+def _layout_relative_chain(tmp_path: Path) -> tuple[Path, Path]:
+    exe = tmp_path / "python3.12"
+    exe.touch()
+    (tmp_path / "python3").symlink_to("python3.12")
+    link = tmp_path / "python"
+    link.symlink_to("python3")
+    return link, exe
+
+
+def _layout_tree_symlink(tmp_path: Path) -> tuple[Path, Path]:
+    real_bin = tmp_path / "install" / "bin"
+    real_bin.mkdir(parents=True)
+    (real_bin / "python3").touch()
+    tree_link = tmp_path / "tree"
+    tree_link.symlink_to(tmp_path / "install")
+    via_tree = tree_link / "bin" / "python3"
+    return via_tree, via_tree
+
+
+def _layout_normpath_mismatch(tmp_path: Path) -> tuple[Path, Path]:
+    real_dir = tmp_path / "deep" / "real"
+    real_dir.mkdir(parents=True)
+    (tmp_path / "deep" / "exe").touch()
+    (real_dir / "python").symlink_to("../exe")
+    dir_link = tmp_path / "link"
+    dir_link.symlink_to(real_dir)
+    via_link = dir_link / "python"
+    return via_link, via_link
+
+
+@pytest.mark.skipif(sys.platform == "win32", reason="POSIX only")
+@pytest.mark.parametrize(
+    "layout",
+    [
+        pytest.param(_layout_regular_file, id="regular-file"),
+        pytest.param(_layout_broken_symlink, id="broken-symlink"),
+        pytest.param(_layout_absolute_symlink, id="absolute-symlink"),
+        pytest.param(_layout_relative_chain, id="relative-chain"),
+        pytest.param(_layout_tree_symlink, id="tree-preserved"),
+        pytest.param(_layout_normpath_mismatch, id="normpath-mismatch"),
+    ],
+)
+def test_resolve_executable_symlink(
+    tmp_path: Path,
+    posix_info: PythonInfo,
+    layout: Callable[[Path], tuple[Path, Path]],
+) -> None:
+    path, expected = layout(tmp_path)
+    assert posix_info._resolve_executable_symlink(str(path)) == str(expected)
+
+
+@pytest.mark.skipif(sys.platform == "win32", reason="POSIX only")
+def test_from_exe_resolves_executable_only_symlink(tmp_path: Path, session_cache: DiskCache) -> None:
+    system_exe = CURRENT.system_executable
+    assert system_exe is not None
+    link = tmp_path / "python3"
+    link.symlink_to(system_exe)
+    info = PythonInfo.from_exe(str(link), session_cache, ignore_cache=True)
+    assert info is not None
+    assert info.system_executable is not None
+    assert Path(info.system_executable).samefile(system_exe)
+    assert not Path(info.system_executable).is_symlink()
+
+
 def test_try_posix_fallback_not_posix() -> None:
     info = PythonInfo()
     info.os = "nt"

{python_discovery-1.4.0 → python_discovery-1.4.1}/pyproject.toml

@@ -199,11 +199,11 @@ html.skip_covered = false
 
 [tool.towncrier]
 name = "python-discovery"
-filename = "docs/changelog.rst"
 directory = "docs/changelog"
+filename = "docs/changelog.rst"
+template = "docs/changelog/template.jinja2"
 title_format = false
 issue_format = ":issue:`{issue}`"
-template = "docs/changelog/template.jinja2"
 type = [
   { directory = "breaking", name = "Backward incompatible changes", showcontent = true },
   { directory = "deprecation", name = "Deprecations (removal in next major release)", showcontent = true },