python-discovery 1.5.2__tar.gz → 1.5.3__tar.gz

{python_discovery-1.5.2 → python_discovery-1.5.3}/.github/dependabot.yaml

@@ -3,6 +3,11 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
+      day: "tuesday"
+    groups:
+      github-actions:
+        patterns:
+          - "*"
     cooldown:
       default-days: 7

{python_discovery-1.5.2 → python_discovery-1.5.3}/.github/workflows/check.yaml

@@ -38,7 +38,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
         with:
           enable-cache: false
           cache-dependency-glob: "pyproject.toml"
@@ -63,7 +63,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
         with:
           enable-cache: false
           cache-dependency-glob: "pyproject.toml"

{python_discovery-1.5.2 → python_discovery-1.5.3}/.github/workflows/prepare-release.yaml

@@ -29,7 +29,7 @@ jobs:
           token: ${{ secrets.RELEASE_PAT }}
           persist-credentials: true
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
         with:
           enable-cache: true
           cache-dependency-glob: "pyproject.toml"

{python_discovery-1.5.2 → python_discovery-1.5.3}/.github/workflows/release.yaml

@@ -15,7 +15,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
         with:
           enable-cache: false
           cache-dependency-glob: "pyproject.toml"

{python_discovery-1.5.2 → python_discovery-1.5.3}/.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.27.0"
+    rev: "v2.28.0"
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.16.2"
+    rev: "v0.16.3"
     hooks:
       - id: ruff-format
       - id: ruff

{python_discovery-1.5.2 → python_discovery-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-discovery
-Version: 1.5.2
+Version: 1.5.3
 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.5.2 → python_discovery-1.5.3}/docs/changelog.rst

@@ -6,6 +6,23 @@
 
 .. towncrier release notes start
 
+********************
+ v1.5.3 (2026-08-24)
+********************
+
+Bug fixes - 1.5.3
+=================
+- Restore discovery of Python 3.6 and 3.7 interpreters: the interrogation script had grown 3.8-only syntax and is now
+  kept to Python 3.6. Candidates below 3.6 log one warning naming the version found instead of two debug-level query
+  attempts, and the verdict is cached so they are queried only once; an absolute-path spec for one raises
+  ``RuntimeError`` with the same message - by :user:`gaborbernat`. (:issue:`116`)
+- Prefer the version-matched system executable when CPython reports an existing generic executable for a copied POSIX
+  virtual environment. (:issue:`124`)
+
+Improved documentation - 1.5.3
+==============================
+- Document the version floors: runs on Python 3.8+, discovers interpreters down to 3.6 - by :user:`gaborbernat`. (:issue:`116`)
+
 ********************
  v1.5.1 (2026-07-31)
 ********************

{python_discovery-1.5.2 → python_discovery-1.5.3}/docs/conf.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import os
 from datetime import datetime, timezone
 from pathlib import Path
 
@@ -14,6 +15,7 @@ release = __version__
 copyright = f"2026-{datetime.now(tz=timezone.utc).year}, {company}"  # ruff:ignore[builtin-variable-shadowing]
 
 extensions = [
+    "sphinx_llm.txt",
     "sphinx.ext.autodoc",
     "sphinx.ext.autosectionlabel",
     "sphinx.ext.extlinks",
@@ -58,3 +60,5 @@ html_theme_options = {
     "sidebar_hide_name": True,
 }
 html_css_files = ["custom.css"]
+
+markdown_http_base = os.environ.get("READTHEDOCS_CANONICAL_URL", "")

{python_discovery-1.5.2 → python_discovery-1.5.3}/pyproject.toml

@@ -65,6 +65,7 @@ docs = [
   "furo>=2025.12.19",
   "sphinx>=9.1",
   "sphinx-autodoc-typehints>=3.6.3",
+  "sphinx-llm>=0.4.1",
   "sphinxcontrib-mermaid>=2",
   "sphinxcontrib-towncrier>=0.4",
   "towncrier>=25.8",
@@ -180,16 +181,16 @@ rules.unresolved-attribute = "ignore"
 ini_options.markers = [ "graalpy" ]
 
 [tool.coverage]
+run.source = [
+  "python_discovery",
+  "tests",
+]
 run.branch = true
 run.dynamic_context = "test_function"
 run.parallel = true
 run.plugins = [
   "covdefaults",
 ]
-run.source = [
-  "python_discovery",
-  "tests",
-]
 paths.source = [
   "src",
   ".tox*/*/lib/python*/site-packages",

{python_discovery-1.5.2 → python_discovery-1.5.3}/src/python_discovery/_py_info_collect.py

@@ -198,25 +198,30 @@ class PythonInfoCollector:
 
     def _fast_get_system_executable(self):
         """Try to get the system executable by just looking at properties."""
-        # 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
+        # Preserve the invoked path because shims may rely on it.
         if not (self.real_prefix or (self.base_prefix is not None and self.base_prefix != self.prefix)):
             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:
             return None
 
-        base_executable = getattr(sys, "_base_executable", None)  # some platforms may set this to help us
-        if base_executable is None:  # use the saved system executable if present
+        base_executable = getattr(sys, "_base_executable", None)
+        if base_executable is None:
             return None
 
-        # we know we're in a virtual environment, can not be us
         if sys.executable == base_executable:
             return None
 
-        # We're not in a venv and base_executable exists; use it directly
+        # CPython accepts pythonX without checking its version when resolving a copied venv.
         if os.path.exists(base_executable):  # pragma: >=3.11 cover
+            major = self.version_info.major
+            ambiguous_names = {"python", "python{}".format(major)}
+            if self.implementation == "PyPy":
+                ambiguous_names.update({"pypy", "pypy3", "pypy{}".format(major)})
+            if os.path.basename(base_executable) in ambiguous_names:
+                versioned = self._try_posix_versioned_executable(base_executable)
+                if versioned is not None and not os.path.samefile(base_executable, versioned):
+                    base_executable = versioned
             return self._resolve_executable_symlink(base_executable)
 
         # Try fallback for POSIX virtual environments
@@ -259,28 +264,48 @@ class PythonInfoCollector:
 
     def _try_posix_fallback_executable(self, base_executable):
         """Find a versioned Python binary as fallback for POSIX virtual environments."""
+        versioned = self._try_posix_versioned_executable(base_executable)
+        if versioned is not None:
+            return versioned
+
+        major, minor = self.version_info.major, self.version_info.minor
+        if self.os != "posix" or (major, minor) < (3, 11):
+            return None
+
+        base_dir = os.path.dirname(base_executable)
+        candidates = ["python{}".format(major)]
+        if self.implementation == "PyPy":
+            candidates.extend(["pypy", "pypy3", "pypy{}".format(major)])
+
+        for candidate in candidates:
+            full_path = os.path.join(base_dir, candidate)
+            if os.path.exists(full_path):
+                return full_path
+
+        return None
+
+    def _try_posix_versioned_executable(self, base_executable):
         major, minor = self.version_info.major, self.version_info.minor
         if self.os != "posix" or (major, minor) < (3, 11):
             return None
 
-        # search relative to the directory of sys._base_executable
         base_dir = os.path.dirname(base_executable)
-        candidates = ["python{}".format(major), "python{}.{}".format(major, minor)]
+        candidates = ["python{}.{}".format(major, minor)]
         if self.implementation == "PyPy":
-            candidates.extend(["pypy", "pypy3", "pypy{}".format(major), "pypy{}.{}".format(major, minor)])
+            candidates.insert(0, "pypy{}.{}".format(major, minor))
 
         for candidate in candidates:
             full_path = os.path.join(base_dir, candidate)
             if os.path.exists(full_path):
                 return full_path
 
-        return None  # in this case we just can't tell easily without poking around FS and calling them, bail
+        return None
 
     @staticmethod
     def _distutils_install():  # pragma: <3.11 cover # 3.11+ uses the "venv" scheme instead
         # use distutils primarily because that's what pip does
         # https://github.com/pypa/pip/blob/main/src/pip/_internal/locations.py#L95
-        # note here we don't import Distribution directly to allow setuptools to patch it
+        # Avoid importing Distribution before setuptools can patch it.
         with warnings.catch_warnings():  # disable warning for PEP-632
             warnings.simplefilter("ignore")
             try:

{python_discovery-1.5.2 → python_discovery-1.5.3}/tests/py_info/test_py_info.py

@@ -75,25 +75,19 @@ def test_bad_exe_py_info_no_raise(
 
 @pytest.mark.parametrize(
     "spec",
-    itertools.chain(
-        [sys.executable],
-        [
-            f"{impl}{'.'.join(str(i) for i in ver)}{'t' if CURRENT.free_threaded else ''}{arch}"
-            for impl, ver, arch in itertools.product(
-                (
-                    [CURRENT.implementation]
-                    + (["python"] if CURRENT.implementation == "CPython" else [])
-                    + (
-                        [CURRENT.implementation.lower()]
-                        if CURRENT.implementation != CURRENT.implementation.lower()
-                        else []
-                    )
-                ),
-                [sys.version_info[0 : i + 1] for i in range(3)],
-                ["", f"-{CURRENT.architecture}"],
-            )
-        ],
-    ),
+    [sys.executable]
+    + [
+        f"{impl}{'.'.join(str(i) for i in ver)}{'t' if CURRENT.free_threaded else ''}{arch}"
+        for impl, ver, arch in itertools.product(
+            (
+                [CURRENT.implementation]
+                + (["python"] if CURRENT.implementation == "CPython" else [])
+                + ([CURRENT.implementation.lower()] if CURRENT.implementation != CURRENT.implementation.lower() else [])
+            ),
+            [sys.version_info[0 : i + 1] for i in range(3)],
+            ["", f"-{CURRENT.architecture}"],
+        )
+    ],
 )
 def test_satisfy_py_info(spec: str) -> None:
     parsed_spec = PythonSpec.from_string_spec(spec)

{python_discovery-1.5.2 → python_discovery-1.5.3}/tests/test_py_info_collect.py

@@ -249,10 +249,38 @@ def test_system_executable_from_existing_base(mocker: MockerFixture, tmp_path: P
     assert PythonInfo().system_executable == str(base)
 
 
+@pytest.mark.usefixtures("no_framework")
+@pytest.mark.parametrize(
+    "same_file",
+    [
+        pytest.param(False, id="distinct"),
+        pytest.param(True, id="alias"),
+    ],
+)
+def test_system_executable_prefers_exact_version(mocker: MockerFixture, tmp_path: Path, *, same_file: bool) -> None:
+    bin_dir = tmp_path / "bin"
+    bin_dir.mkdir()
+    versioned = bin_dir / "python3.13"
+    versioned.touch()
+    generic = bin_dir / "python3"
+    if same_file:
+        generic.symlink_to(versioned.name)
+        landmark = tmp_path / "lib" / Path(os.__file__).parent.name / "os.py"
+        landmark.parent.mkdir(parents=True)
+        landmark.touch()
+    else:
+        generic.touch()
+    _venv(mocker)
+    mocker.patch.object(sys, "_base_executable", str(generic), create=True)
+    mocker.patch.object(sys, "version_info", VersionInfo(3, 13, 0, "final", 0))
+    assert PythonInfo().system_executable == str(generic if same_file else versioned)
+
+
 def test_system_executable_versioned_fallback(mocker: MockerFixture, tmp_path: Path) -> None:
     _venv_missing_base_no_candidates(mocker, tmp_path)
-    versioned = tmp_path / "python3"
+    versioned = tmp_path / "python3.12"
     versioned.touch()
+    (tmp_path / "python3").touch()
     assert PythonInfo().system_executable == str(versioned)
 
 

python_discovery-1.5.2/docs/changelog/116.bugfix.rst

@@ -1,4 +0,0 @@
-Restore discovery of Python 3.6 and 3.7 interpreters: the interrogation script had grown 3.8-only syntax and is now
-kept to Python 3.6. Candidates below 3.6 log one warning naming the version found instead of two debug-level query
-attempts, and the verdict is cached so they are queried only once; an absolute-path spec for one raises
-``RuntimeError`` with the same message - by :user:`gaborbernat`.

python_discovery-1.5.2/docs/changelog/116.doc.rst

@@ -1 +0,0 @@
-Document the version floors: runs on Python 3.8+, discovers interpreters down to 3.6 - by :user:`gaborbernat`.