python-discovery 1.3.2__py3-none-any.whl → 1.4.1__py3-none-any.whl

python_discovery/_py_info.py

@@ -12,6 +12,7 @@ import sys
 import sysconfig
 import warnings
 from collections import OrderedDict
+from itertools import product
 from string import digits
 from typing import TYPE_CHECKING, ClassVar, Final, NamedTuple
 
@@ -73,6 +74,7 @@ class PythonInfo:  # noqa: PLR0904
         self.version = sys.version
         self.os = os.name
         self.free_threaded = sysconfig.get_config_var("Py_GIL_DISABLED") == 1
+        self.debug_build = bool(sysconfig.get_config_var("Py_DEBUG"))
 
     def _init_prefixes(self) -> None:
         def abs_path(value: str | None) -> str | None:
@@ -202,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:
@@ -218,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
@@ -404,10 +429,11 @@ class PythonInfo:  # noqa: PLR0904
     @property
     def spec(self) -> str:
         """A specification string identifying this interpreter (e.g. ``CPython3.13.2-64-arm64``)."""
-        return "{}{}{}-{}-{}".format(
+        return "{}{}{}{}-{}-{}".format(
             self.implementation,
             ".".join(str(i) for i in self.version_info),
             "t" if self.free_threaded else "",
+            "d" if self.debug_build else "",
             self.architecture,
             self.machine,
         )
@@ -731,17 +757,14 @@ class PythonInfo:  # noqa: PLR0904
 
     def _find_possible_exe_names(self) -> list[str]:
         name_candidate = OrderedDict()
+        mods = ["", "t"] if self.free_threaded else [""]
+        debug_suffixes = ["_d", ""] if self.debug_build else [""]
+        archs = [f"-{self.architecture}", ""]
         for name in self._possible_base():
             for at in (3, 2, 1, 0):
                 version = ".".join(str(i) for i in self.version_info[:at])
-                mods = [""]
-                if self.free_threaded:
-                    mods.append("t")
-                for mod in mods:
-                    for arch in [f"-{self.architecture}", ""]:
-                        for ext in EXTENSIONS:
-                            candidate = f"{name}{version}{mod}{arch}{ext}"
-                            name_candidate[candidate] = None
+                for mod, debug, arch, ext in product(mods, debug_suffixes, archs, EXTENSIONS):
+                    name_candidate[f"{name}{version}{mod}{debug}{arch}{ext}"] = None
         return list(name_candidate.keys())
 
     def _possible_base(self) -> Generator[str, None, None]:

{python_discovery-1.3.2.dist-info → python_discovery-1.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-discovery
-Version: 1.3.2
+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.3.2.dist-info → python_discovery-1.4.1.dist-info}/RECORD

@@ -3,14 +3,14 @@ python_discovery/_cache.py,sha256=bG4fD-h2pdPmb4v9BldbXmJ5Tlt1boiH1Qrz8kp9Dds,50
 python_discovery/_cached_py_info.py,sha256=1AFEoc_-OaCi1PXmaFz9Iy_bEuqOhJdFSDFHljzD-EE,8540
 python_discovery/_compat.py,sha256=iqxGuhK9rPaiui80G1H1KrweoMJ16gyLYEmUrSXrp5c,709
 python_discovery/_discovery.py,sha256=cdo6xlktNMEwsQn2R8pn4T1VDE4LD2EJPUyCT7vlHnM,16830
-python_discovery/_py_info.py,sha256=ls4ZOe93RCsfjN2uEz1r4l3K8m-rtm3ZKRp59xJDJHg,34354
+python_discovery/_py_info.py,sha256=Pd-rZhulxTWCoEa2SaEH2MLm8oeNzjWzpgAFmZ5oIic,35723
 python_discovery/_py_spec.py,sha256=Kky0LXi8BU_ojfMdvvRhtDk6I4WPjovwXOu6E2QYHTo,10421
 python_discovery/_specifier.py,sha256=PTh6suNTC0hMnFSxFYF_vggdciFLnwxoh1YflSbgCXA,10368
 python_discovery/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_discovery/_windows/__init__.py,sha256=qthcyGh36b3WkeSbZ4ECRRYLbCOCaQu5X_DRZ98tXfk,315
 python_discovery/_windows/_pep514.py,sha256=zXxje07QIXfrCB3eYbZHOBgXcvAQQpZ-ZWun3_zrapA,7688
 python_discovery/_windows/_propose.py,sha256=iMJf6l0TU4SvuV8UsCHHINAe9L5dUT949xyeyMVdong,1565
-python_discovery-1.3.2.dist-info/METADATA,sha256=nmMtjtmWU2DTdKudFjFa6Nrtlwk3OEDbB_BkeRYaw5A,5592
-python_discovery-1.3.2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-python_discovery-1.3.2.dist-info/licenses/LICENSE,sha256=kOJeH68qSq6o2V7o5_VziwUqGswMnFgGgQH5Mahr1Yg,1023
-python_discovery-1.3.2.dist-info/RECORD,,
+python_discovery-1.4.1.dist-info/METADATA,sha256=g-gwW8yAGaOFpbnCZoxY4fTQ3KBrGzYYadpCvbZjRcc,5592
+python_discovery-1.4.1.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+python_discovery-1.4.1.dist-info/licenses/LICENSE,sha256=kOJeH68qSq6o2V7o5_VziwUqGswMnFgGgQH5Mahr1Yg,1023
+python_discovery-1.4.1.dist-info/RECORD,,

{python_discovery-1.3.2.dist-info → python_discovery-1.4.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.29.0
+Generator: hatchling 1.30.1
 Root-Is-Purelib: true
 Tag: py3-none-any