python-discovery 1.4.3__py3-none-any.whl → 1.4.4__py3-none-any.whl

python_discovery/_py_info.py

@@ -481,6 +481,8 @@ class PythonInfo:  # noqa: PLR0904
             return False
         if spec.free_threaded is not None and spec.free_threaded != self.free_threaded:
             return False
+        if spec.debug is not None and spec.debug != self.debug_build:
+            return False
         if spec.version_specifier is not None and not self._satisfies_version_specifier(spec):
             return False
         return all(
@@ -717,7 +719,7 @@ class PythonInfo:  # noqa: PLR0904
         info = self.from_exe(exe_path, cache, resolve_to_host=False, raise_on_error=False, env=env)
         if info is None:  # ignore if for some reason we can't query
             return None
-        for item in ["implementation", "architecture", "machine", "version_info"]:
+        for item in ["implementation", "architecture", "machine", "version_info", "free_threaded", "debug_build"]:
             found = getattr(info, item)
             searched = getattr(self, item)
             if found != searched:
@@ -772,7 +774,9 @@ 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 [""]
+        # _d (Windows python_d.exe), -dbg (Debian's own name), d (the abiflags form used by
+        # upstream/Fedora and also shipped by Debian, so pythonX.Yd / pythonX.Ytd resolve too)
+        debug_suffixes = ["_d", "-dbg", "d", ""] if self.debug_build else [""]
         archs = [f"-{self.architecture}", ""]
         for name in self._possible_base():
             for at in (3, 2, 1, 0):

python_discovery/_py_spec.py

@@ -16,6 +16,7 @@ PATTERN = re.compile(
     (?P<impl>[a-zA-Z]+)?            # implementation (e.g. cpython, pypy)
     (?P<version>[0-9.]+)?           # version (e.g. 3.12, 3.12.1)
     (?P<threaded>t)?                # free-threaded flag
+    (?P<debug>d|(?:-dbg|-debug)(?=-|$))?  # debug build flag (d, -dbg or -debug)
     (?:-(?P<arch>32|64))?           # architecture bitness
     (?:-(?P<machine>[a-zA-Z0-9_.]+))?  # ISA (e.g. arm64, x86_64, i86pc.64bit)
     $
@@ -68,6 +69,7 @@ def _parse_spec_pattern(string_spec: str) -> PythonSpec | None:
     groups = match.groupdict()
     version = groups["version"]
     major, minor, micro, threaded = None, None, None, None
+    debug = True if groups["debug"] else None  # unconstrained unless an explicit d/-dbg/-debug marker is present
     if version is not None:
         try:
             major, minor, micro = _parse_version_parts(version)
@@ -83,7 +85,9 @@ def _parse_spec_pattern(string_spec: str) -> PythonSpec | None:
     machine = groups.get("machine")
     if machine is not None:
         machine = normalize_isa(machine)
-    return PythonSpec(string_spec, impl, major, minor, micro, arch, None, free_threaded=threaded, machine=machine)
+    return PythonSpec(
+        string_spec, impl, major, minor, micro, arch, None, free_threaded=threaded, machine=machine, debug=debug
+    )
 
 
 def _parse_specifier(string_spec: str) -> PythonSpec | None:
@@ -117,6 +121,7 @@ class PythonSpec:
     :param path: filesystem path to a specific interpreter, or ``None``.
     :param free_threaded: whether a free-threaded build is required, or ``None`` for any.
     :param machine: required ISA (e.g. ``"arm64"``), or ``None`` for any.
+    :param debug: whether a debug (``Py_DEBUG``) build is required, or ``None`` for any.
     :param version_specifier:
         `version specifier <https://packaging.python.org/en/latest/specifications/version-specifiers/>`_
         constraints, or ``None``.
@@ -134,6 +139,7 @@ class PythonSpec:
         *,
         free_threaded: bool | None = None,
         machine: str | None = None,
+        debug: bool | None = None,
         version_specifier: SpecifierSet | None = None,
     ) -> None:
         self.str_spec = str_spec
@@ -144,6 +150,7 @@ class PythonSpec:
         self.free_threaded = free_threaded
         self.architecture = architecture
         self.machine = machine
+        self.debug = debug
         self.path = path
         self.version_specifier = version_specifier
 
@@ -181,10 +188,11 @@ class PythonSpec:
         else:
             impl = "python"
         mod = "t?" if self.free_threaded else ""
+        dbg = "(?:d|-dbg|-debug)?" if self.debug else ""
         suffix = r"\.exe" if windows else ""
         version_conditional = "?" if windows or self.major is None else ""
         return re.compile(
-            rf"(?P<impl>{impl})(?P<v>{version}{mod}){version_conditional}{suffix}$",
+            rf"(?P<impl>{impl})(?P<v>{version}{mod}){version_conditional}{dbg}{suffix}$",
             flags=re.IGNORECASE,
         )
 
@@ -263,6 +271,7 @@ class PythonSpec:
             "machine",
             "path",
             "free_threaded",
+            "debug",
             "version_specifier",
         )
         return f"{name}({', '.join(f'{k}={getattr(self, k)}' for k in params if getattr(self, k) is not None)})"

{python_discovery-1.4.3.dist-info → python_discovery-1.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-discovery
-Version: 1.4.3
+Version: 1.4.4
 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.3.dist-info → python_discovery-1.4.4.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=7e4Ei810L2uS-JuqNdiCHvgyb-R4gj_5VrtN3yNtIAg,36647
-python_discovery/_py_spec.py,sha256=Kky0LXi8BU_ojfMdvvRhtDk6I4WPjovwXOu6E2QYHTo,10421
+python_discovery/_py_info.py,sha256=fFhS-gZoYIJYscqM56h1RwFknJou8bgf3h8VXrqm5g8,36974
+python_discovery/_py_spec.py,sha256=FN7nsWOkxdFpmd5st5hz5e2f7egbLzzbRiNiBndAYZc,10877
 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.4.3.dist-info/METADATA,sha256=_9Cm3smElV4lgueLcYMDdHjFzo66tjO1tqH-K6KwkG0,5592
-python_discovery-1.4.3.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-python_discovery-1.4.3.dist-info/licenses/LICENSE,sha256=kOJeH68qSq6o2V7o5_VziwUqGswMnFgGgQH5Mahr1Yg,1023
-python_discovery-1.4.3.dist-info/RECORD,,
+python_discovery-1.4.4.dist-info/METADATA,sha256=15xJaaopcuujqLtLazKC4ZadMMCtHPWntqISeeYMFCQ,5592
+python_discovery-1.4.4.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+python_discovery-1.4.4.dist-info/licenses/LICENSE,sha256=kOJeH68qSq6o2V7o5_VziwUqGswMnFgGgQH5Mahr1Yg,1023
+python_discovery-1.4.4.dist-info/RECORD,,

{python_discovery-1.4.3.dist-info → python_discovery-1.4.4.dist-info}/WHEEL

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