python-discovery 1.6.1__tar.gz → 1.6.3__tar.gz

{python_discovery-1.6.1 → python_discovery-1.6.3}/.github/workflows/check.yaml

@@ -14,7 +14,7 @@ permissions:
   contents: read
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     strategy:
       fail-fast: false
       matrix:
@@ -27,9 +27,8 @@ jobs:
           - "3.11"
           - "3.10"
           - "3.9"
-          - "3.8"
-          - type-3.8
-          - type-3.14
+          - type-3.9
+          - type-3.15
           - dev
           - pkg_meta
     steps:
@@ -38,15 +37,16 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
         with:
+          python-version: "3.15"
           enable-cache: false
           cache-dependency-glob: "pyproject.toml"
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install tox
-        run: uv tool install --python-preference only-managed --python 3.14 tox --with tox-uv
+        run: uv tool install --python-preference only-managed --python 3.15 tox --with tox-uv
       - name: Install Python
-        if: startsWith(matrix.env, '3.') && matrix.env != '3.14'
+        if: startsWith(matrix.env, '3.') && matrix.env != '3.15'
         run: uv python install --python-preference only-managed ${{ matrix.env }}
       - name: Setup test suite
         run: tox run -vv --notest --skip-missing-interpreters false -e ${{ matrix.env }}
@@ -56,25 +56,27 @@ jobs:
           PYTEST_ADDOPTS: "-vv --durations=20"
           DIFF_AGAINST: HEAD
   old-target:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0
           persist-credentials: false
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
         with:
+          python-version: "3.15"
           enable-cache: false
           cache-dependency-glob: "pyproject.toml"
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build the wheel
         run: uv build --wheel --out-dir dist .
-      - name: Discover Python 3.6
-        run: tasks/old_target_check.sh 3.6 discover
-      - name: Discover Python 3.7
-        run: tasks/old_target_check.sh 3.7 discover
-      - name: Reject Python 3.5
-        run: tasks/old_target_check.sh 3.5 rejected
-      - name: Reject Python 2.7
-        run: tasks/old_target_check.sh 2.7 rejected
+      - parallel:
+          - name: Discover Python 3.6
+            run: tasks/old_target_check.sh 3.6 discover
+          - name: Discover Python 3.7
+            run: tasks/old_target_check.sh 3.7 discover
+          - name: Reject Python 3.5
+            run: tasks/old_target_check.sh 3.5 rejected
+          - name: Reject Python 2.7
+            run: tasks/old_target_check.sh 2.7 rejected

{python_discovery-1.6.1 → python_discovery-1.6.3}/.github/workflows/prepare-release.yaml

@@ -29,8 +29,9 @@ jobs:
           token: ${{ secrets.RELEASE_PAT }}
           persist-credentials: true
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
         with:
+          python-version: "3.15"
           enable-cache: true
           cache-dependency-glob: "pyproject.toml"
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -79,7 +80,7 @@ jobs:
           echo "Next version: $next"
           echo "version=$next" >> $GITHUB_OUTPUT
       - name: Install tox
-        run: uv tool install --python-preference only-managed --python 3.14 tox@latest --with tox-uv
+        run: uv tool install --python-preference only-managed --python 3.15 tox@latest --with tox-uv
       - name: Run release process
         run: tox run -e release -- ${STEPS_VERSION_OUTPUTS_VERSION}
         env:

{python_discovery-1.6.1 → python_discovery-1.6.3}/.github/workflows/release.yaml

@@ -8,29 +8,30 @@ env:
   dists-artifact-name: python-package-distributions
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0
           persist-credentials: false
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
         with:
+          python-version: "3.15"
           enable-cache: false
           cache-dependency-glob: "pyproject.toml"
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build package
-        run: uv build --python 3.14 --python-preference only-managed --sdist --wheel . --out-dir dist
+        run: uv build --python 3.15 --python-preference only-managed --sdist --wheel . --out-dir dist
       - name: Store the distribution packages
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
         with:
           name: ${{ env.dists-artifact-name }}
           path: dist/*
   release:
     needs:
       - build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     environment:
       name: release
       url: https://pypi.org/project/python-discovery/${{ github.ref_name }}
@@ -38,7 +39,7 @@ jobs:
       id-token: write
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
         with:
           name: ${{ env.dists-artifact-name }}
           path: dist/

{python_discovery-1.6.1 → python_discovery-1.6.3}/.pre-commit-config.yaml

@@ -1,3 +1,5 @@
+default_language_version:
+  python: python3.15
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0
@@ -5,7 +7,7 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.38.0
+    rev: 0.38.2
     hooks:
       - id: check-github-workflows
         args: ["--verbose"]
@@ -13,13 +15,12 @@ repos:
     rev: v2.4.3
     hooks:
       - id: codespell
-        additional_dependencies: ["tomli>=2.4"]
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "v2.29.4"
+    rev: "v2.30.3"
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.16.7"
+    rev: "v0.17.0"
     hooks:
       - id: ruff-format
       - id: ruff

{python_discovery-1.6.1 → python_discovery-1.6.3}/.readthedocs.yaml

@@ -4,5 +4,5 @@ build:
   tools: {}
   commands:
     - curl -LsSf https://astral.sh/uv/install.sh | sh
-    - ~/.local/bin/uv tool install tox --with tox-uv -p 3.14 --managed-python
+    - ~/.local/bin/uv tool install tox --with tox-uv -p 3.15 --managed-python
     - ~/.local/bin/tox run -e docs -- "$READTHEDOCS_OUTPUT/html"

python_discovery-1.6.3/.readthedocs.yml

@@ -0,0 +1,8 @@
+version: 2
+build:
+  os: ubuntu-22.04
+  tools: {}
+  commands:
+    - curl -LsSf https://astral.sh/uv/install.sh | sh
+    - ~/.local/bin/uv tool install tox --with tox-uv -p 3.15 --managed-python
+    - ~/.local/bin/tox run -e docs -- "${READTHEDOCS_OUTPUT}"/html

{python_discovery-1.6.1 → python_discovery-1.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-discovery
-Version: 1.6.1
+Version: 1.6.3
 Summary: Python interpreter discovery
 Project-URL: Changelog, https://github.com/tox-dev/python-discovery/releases
 Project-URL: Documentation, https://python-discovery.readthedocs.io
@@ -35,7 +35,6 @@ Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -46,8 +45,8 @@ Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
-Requires-Python: >=3.8
-Requires-Dist: filelock>=3.15.4
+Requires-Python: >=3.9
+Requires-Dist: filelock>=3.16.1
 Description-Content-Type: text/markdown
 
 # [`python-discovery`](https://python-discovery.readthedocs.io/en/latest/)
@@ -68,7 +67,7 @@ the right one for you.
 Give it a requirement like `python3.12` or `>=3.11,<3.13`, and it searches all known locations, verifies each candidate,
 and returns detailed metadata about the match. Results are cached to disk so repeated lookups are fast.
 
-The library runs on Python 3.8+ and discovers interpreters as old as Python 3.6; anything older is skipped with a
+The library runs on Python 3.9+ and discovers interpreters as old as Python 3.6; anything older is skipped with a
 warning naming the version it found.
 
 ## Usage

{python_discovery-1.6.1 → python_discovery-1.6.3}/README.md

@@ -16,7 +16,7 @@ the right one for you.
 Give it a requirement like `python3.12` or `>=3.11,<3.13`, and it searches all known locations, verifies each candidate,
 and returns detailed metadata about the match. Results are cached to disk so repeated lookups are fast.
 
-The library runs on Python 3.8+ and discovers interpreters as old as Python 3.6; anything older is skipped with a
+The library runs on Python 3.9+ and discovers interpreters as old as Python 3.6; anything older is skipped with a
 warning naming the version it found.
 
 ## Usage

python_discovery-1.6.3/docs/changelog/147.bugfix.rst

@@ -0,0 +1,2 @@
+Treat specs with dot-only version components, such as ``python.``, as literal executable paths instead of raising
+``IndexError`` - by :user:`harbinresearcher`.

python_discovery-1.6.3/docs/changelog/148.bugfix.rst

@@ -0,0 +1,2 @@
+Pass PEP 514 ``ExecutableArguments`` to registered Windows interpreters when querying them, so a registration that
+points at a launcher such as ``py.exe -3.11`` reports the interpreter it selects - by :user:`blouirts123`.

{python_discovery-1.6.1 → python_discovery-1.6.3}/docs/changelog.rst

@@ -6,6 +6,17 @@
 
 .. towncrier release notes start
 
+********************
+ v1.6.2 (2026-10-10)
+********************
+
+Bug fixes - 1.6.2
+=================
+- Discard malformed interpreter cache entries and query the interpreter again, including entries with missing,
+  non-string or unusable ``system_executable`` paths - by :user:`darrenhuai`. (:issue:`141`)
+- Use the default interpreter query timeout and warn for invalid ``PY_DISCOVERY_TIMEOUT`` values. Accept ``inf``
+  or values above the subprocess wait limit to disable the timeout - by :user:`darrenhuai`. (:issue:`143`)
+
 ********************
  v1.6.1 (2026-09-18)
 ********************

{python_discovery-1.6.1 → python_discovery-1.6.3}/docs/explanation.rst

@@ -275,12 +275,13 @@ If your system consistently hits timeouts, you can customize the timeout via the
 
 The timeout applies to each individual interpreter being queried. If you set a value that is too low,
 legitimate interpreters may be skipped; if too high, the discovery process may take longer to fail
-when encountering problematic interpreters.
+when encountering problematic interpreters. For invalid values, python-discovery logs a warning and uses
+the default of 15 seconds. Set ``inf`` to disable the timeout.
 
 Supported Python versions
 -------------------------
 
-Two floors apply: python-discovery itself runs on Python 3.8+ (``requires-python``), while discovery
+Two floors apply: python-discovery itself runs on Python 3.9+ (``requires-python``), while discovery
 reaches down to Python 3.6 - old enough to cover RHEL 8's system Python.
 
 python-discovery skips candidates below 3.6 with one warning naming the executable, the version

{python_discovery-1.6.1 → python_discovery-1.6.3}/docs/reference/environment-variables.rst

@@ -36,3 +36,7 @@ Setting this variable extends the allowed time for each interpreter query.
 - Setting the value too low may skip legitimate interpreters
 - Setting it too high increases discovery time when encountering problematic interpreters
 - The value is read from the environment dict passed to :func:`~python_discovery.get_interpreter`
+- For invalid values, including empty strings, ``nan``, ``0`` and negative numbers, python-discovery logs a warning
+  and uses the default of 15 seconds
+- ``inf`` or a value above 2,147,483.647 seconds (about 24.9 days) disables the timeout. This limit applies on all
+  platforms because some subprocess waits accept a signed 32-bit count of milliseconds

{python_discovery-1.6.1 → python_discovery-1.6.3}/pyproject.toml

@@ -19,7 +19,7 @@ license.file = "LICENSE"
 maintainers = [
   { name = "Bernát Gábor", email = "gaborjbernat@gmail.com" },
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Intended Audience :: Developers",
@@ -28,7 +28,6 @@ classifiers = [
   "Operating System :: Microsoft :: Windows",
   "Operating System :: POSIX",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
@@ -44,7 +43,7 @@ dynamic = [
   "version",
 ]
 dependencies = [
-  "filelock>=3.15.4",
+  "filelock>=3.16.1",
 ]
 urls.Changelog = "https://github.com/tox-dev/python-discovery/releases"
 urls.Documentation = "https://python-discovery.readthedocs.io"
@@ -55,24 +54,25 @@ urls.Tracker = "https://github.com/tox-dev/python-discovery/issues"
 [dependency-groups]
 test = [
   "covdefaults>=2.3",
-  "coverage>=7.5.4",
+  "coverage>=7.6.1",
   "pytest>=8.3.5",
-  "pytest-mock>=3.14",
-  "setuptools>=75.1",
-  "vermin>=1.6",
+  "pytest-mock>=3.14.1",
+  "setuptools>=75.3.4",
+  "typing-extensions>=4.12",
+  "vermin>=1.8",
 ]
 docs = [
   "furo>=2025.12.19",
   "sphinx>=9.1",
   "sphinx-autodoc-typehints>=3.6.3",
-  "sphinx-llm>=0.4.1",
+  "sphinx-llm>=0.4.1,!=1.1",
   "sphinxcontrib-mermaid>=2",
   "sphinxcontrib-towncrier>=0.4",
   "towncrier>=25.8",
 ]
 release = [
-  "gitpython>=3.1.46",
-  "packaging>=26",
+  "gitpython>=3.2",
+  "packaging>=26.2",
   "pre-commit>=4.5.1",
   "towncrier>=25.8",
 ]
@@ -81,6 +81,7 @@ release = [
 version.source = "vcs"
 
 [tool.ruff]
+target-version = "py39"
 line-length = 120
 format.preview = true
 format.docstring-code-line-length = 100

{python_discovery-1.6.1 → python_discovery-1.6.3}/src/python_discovery/_cached_py_info.py

@@ -30,17 +30,21 @@ if TYPE_CHECKING:
     from ._cache import ContentStore, PyInfoCache
 
     class CacheEntryMeta(TypedDict):
-        """Identity of a cached interrogation result: the queried binary and the script that produced it."""
+        """Identity of a cached interrogation result: the queried binary, its arguments and the script."""
 
         st_mtime: float
         path: str
         hash: str | None
+        arguments: str | None
 
 
-_CACHE: OrderedDict[Path, PythonInfo | Exception] = OrderedDict()
-_CACHE[Path(sys.executable)] = PythonInfo()
+_CACHE: OrderedDict[tuple[Path, str | None], PythonInfo | Exception] = OrderedDict()
+_CACHE[Path(sys.executable), None] = PythonInfo()
 _LOGGER: Final[logging.Logger] = logging.getLogger(__name__)
 _PY_INFO_SCRIPT: Final[Path] = Path(__file__).resolve().parent / "_py_info_collect.py"
+_DEFAULT_QUERY_TIMEOUT: Final[float] = 15.0
+# poll(2) limits milliseconds to a signed C int.
+_MAX_QUERY_TIMEOUT: Final[float] = (2**31 - 1) / 1000
 
 
 class _UnsupportedInterpreterError(RuntimeError):
@@ -55,9 +59,10 @@ def from_exe(  # ruff:ignore[too-many-arguments]
     *,
     raise_on_error: bool = True,
     ignore_cache: bool = False,
+    executable_args: str | None = None,
 ) -> PythonInfo | None:
     env = os.environ if env is None else env
-    result = _get_from_cache(cls, cache, exe, env, ignore_cache=ignore_cache)
+    result = _get_from_cache(cls, cache, exe, env, ignore_cache=ignore_cache, executable_args=executable_args)
     if isinstance(result, Exception):
         if raise_on_error:
             raise result
@@ -66,31 +71,34 @@ def from_exe(  # ruff:ignore[too-many-arguments]
     return result
 
 
-def _get_from_cache(
+def _get_from_cache(  # ruff:ignore[too-many-arguments]
     cls: type[PythonInfo],
     cache: PyInfoCache | None,
     exe: str,
     env: Mapping[str, str],
     *,
     ignore_cache: bool = True,
+    executable_args: str | None = None,
 ) -> PythonInfo | Exception:
-    exe_path = Path(exe)
-    if not ignore_cache and exe_path in _CACHE:
-        result = _CACHE[exe_path]
+    key = Path(exe), executable_args
+    if not ignore_cache and key in _CACHE:
+        result = _CACHE[key]
     else:
-        py_info = _get_via_file_cache(cls, cache, exe_path, exe, env)
-        result = _CACHE[exe_path] = py_info
-    if isinstance(result, PythonInfo):
+        result = _CACHE[key] = _get_via_file_cache(cls, cache, key[0], exe, env, executable_args=executable_args)
+    # with launcher arguments the queried binary is not the interpreter, so keep the one the query reported
+    if isinstance(result, PythonInfo) and executable_args is None:
         result.executable = exe
     return result
 
 
-def _get_via_file_cache(
+def _get_via_file_cache(  # ruff:ignore[too-many-arguments]
     cls: type[PythonInfo],
     cache: PyInfoCache | None,
     path: Path,
     exe: str,
     env: Mapping[str, str],
+    *,
+    executable_args: str | None = None,
 ) -> PythonInfo | Exception:
     path_text = str(path)
     try:
@@ -104,17 +112,22 @@ def _get_via_file_cache(
 
     resolved_cache = cache if cache is not None else NoOpCache()
     py_info_store = resolved_cache.py_info(path)
-    entry_meta: CacheEntryMeta = {"st_mtime": path_modified, "path": path_text, "hash": py_info_hash}
+    entry_meta: CacheEntryMeta = {
+        "st_mtime": path_modified,
+        "path": path_text,
+        "hash": py_info_hash,
+        "arguments": executable_args,
+    }
     with py_info_store.locked():
         cached = _read_cache_entry(cls, py_info_store, entry_meta)
         if isinstance(cached, _UnsupportedInterpreterError):
             return cached
         py_info = cached
         if py_info is None:
-            failure, py_info = _run_subprocess(cls, exe, env)
+            failure, py_info = _run_subprocess(cls, exe, env, executable_args)
             if failure is not None and not isinstance(failure, _UnsupportedInterpreterError):
                 _LOGGER.debug("first subprocess attempt failed for %s (%s), retrying", exe, failure)
-                failure, py_info = _run_subprocess(cls, exe, env)
+                failure, py_info = _run_subprocess(cls, exe, env, executable_args)
             if isinstance(failure, _UnsupportedInterpreterError):
                 _LOGGER.warning("%s", failure)  # the verdict is permanent, warn once and remember it
                 py_info_store.write({**entry_meta, "unsupported": str(failure)})
@@ -136,7 +149,7 @@ def _read_cache_entry(
 ) -> PythonInfo | _UnsupportedInterpreterError | None:
     if not py_info_store.exists() or (data := py_info_store.read()) is None:
         return None
-    if all(data.get(key) == value for key, value in entry_meta.items()):
+    if isinstance(data, dict) and all(data.get(key) == value for key, value in entry_meta.items()):
         if isinstance(unsupported := data.get("unsupported"), str):
             return _UnsupportedInterpreterError(unsupported)
         if isinstance(content := data.get("content"), dict):
@@ -152,10 +165,10 @@ def _load_cached_py_info(
 ) -> PythonInfo | None:
     try:
         py_info = cls.from_dict(content.copy())
-    except (KeyError, TypeError):
-        py_info_store.remove()
-        return None
-    if (sys_exe := py_info.system_executable) is not None and not Path(sys_exe).exists():
+        stale = (sys_exe := py_info.system_executable) is not None and not Path(sys_exe).is_file()
+    except (AttributeError, KeyError, OSError, TypeError):
+        stale = True
+    if stale:
         py_info_store.remove()
         return None
     return py_info
@@ -211,16 +224,20 @@ def _run_subprocess(
     cls: type[PythonInfo],
     exe: str,
     env: Mapping[str, str],
+    executable_args: str | None = None,
 ) -> tuple[Exception | None, PythonInfo | None]:
     start_cookie = gen_cookie()
     end_cookie = gen_cookie()
-    timeout = float(env.get("PY_DISCOVERY_TIMEOUT", "15"))
+    timeout = _query_timeout(env.get("PY_DISCOVERY_TIMEOUT"))
     with _resolve_py_info_script() as py_info_script:
-        cmd = [exe, str(py_info_script), start_cookie, end_cookie]
+        cmd: list[str] | str = [exe, str(py_info_script), start_cookie, end_cookie]
+        if executable_args is not None:
+            # PEP 514 ExecutableArguments is raw command line text, placed before the script per the PEP
+            cmd = f"{subprocess.list2cmdline(cmd[:1])} {executable_args} {subprocess.list2cmdline(cmd[1:])}"
         env = dict(env)
         env.pop("__PYVENV_LAUNCHER__", None)
         env["PYTHONUTF8"] = "1"
-        _LOGGER.debug("get interpreter info via cmd: %s", LogCmd(cmd))
+        _LOGGER.debug("get interpreter info via cmd: %s", cmd if isinstance(cmd, str) else LogCmd(cmd))
         try:
             process = Popen(  # ruff:ignore[subprocess-without-shell-equals-true]
                 cmd,
@@ -245,7 +262,8 @@ def _run_subprocess(
     out, raw_out, out_starts, out_ends = _extract_between_cookies(out, start_cookie, end_cookie)
     try:
         result = cls.from_json(out)
-        result.executable = exe
+        if executable_args is None:
+            result.executable = exe
     except json.JSONDecodeError as exc:
         _LOGGER.warning(
             "subprocess %s returned invalid JSON; raw stdout %d chars, start cookie %s, end cookie %s, "
@@ -264,6 +282,22 @@ def _run_subprocess(
     return None, result
 
 
+@lru_cache(maxsize=128)
+def _query_timeout(raw: str | None) -> float | None:
+    if raw is None:
+        return _DEFAULT_QUERY_TIMEOUT
+    try:
+        timeout = float(raw)
+    except ValueError:
+        timeout = 0.0
+    if timeout > 0:
+        return timeout if timeout <= _MAX_QUERY_TIMEOUT else None
+    _LOGGER.warning(
+        "ignoring PY_DISCOVERY_TIMEOUT=%r, not a positive number of seconds; using %s", raw, _DEFAULT_QUERY_TIMEOUT
+    )
+    return _DEFAULT_QUERY_TIMEOUT
+
+
 def _query_failure(exe: str, out: str, err: str | None, code: int | None) -> RuntimeError:
     # the gate's exit code and stderr marker must both be present: either alone can collide, an errno of 79 from a
     # failed exec or a shim that echoes the marker phrase, but only the gate produces the combination

{python_discovery-1.6.1 → python_discovery-1.6.3}/src/python_discovery/_py_info.py

@@ -378,10 +378,41 @@ class PythonInfo:  # ruff:ignore[too-many-public-methods]
         :param resolve_to_host: resolve through virtualenv layers to the system interpreter.
         :param env: environment mapping; defaults to :data:`os.environ`.
         """
+        return cls._from_exe_with_args(
+            exe,
+            cache,
+            executable_args=None,
+            raise_on_error=raise_on_error,
+            ignore_cache=ignore_cache,
+            resolve_to_host=resolve_to_host,
+            env=env,
+        )
+
+    @classmethod
+    def _from_exe_with_args(  # ruff:ignore[too-many-arguments]
+        cls,
+        exe: str,
+        cache: PyInfoCache | None = None,
+        *,
+        executable_args: str | None,
+        raise_on_error: bool = True,
+        ignore_cache: bool = False,
+        resolve_to_host: bool = True,
+        env: Mapping[str, str] | None = None,
+    ) -> PythonInfo | None:
+        """Interrogate an executable with optional platform-specific leading arguments."""
         from ._cached_py_info import from_exe  # ruff:ignore[import-outside-top-level]
 
         env = os.environ if env is None else env
-        proposed = from_exe(cls, cache, exe, env=env, raise_on_error=raise_on_error, ignore_cache=ignore_cache)
+        proposed = from_exe(
+            cls,
+            cache,
+            exe,
+            env=env,
+            raise_on_error=raise_on_error,
+            ignore_cache=ignore_cache,
+            executable_args=executable_args,
+        )
 
         if isinstance(proposed, PythonInfo) and resolve_to_host:
             try:

{python_discovery-1.6.1 → python_discovery-1.6.3}/src/python_discovery/_py_info_collect.py

@@ -321,7 +321,7 @@ class PythonInfoCollector:
             "script_args": "--no-user-cfg",
         })  # conf files not parsed so they do not hijack paths
         if hasattr(sys, "_framework"):  # pragma: no cover # macOS framework builds only
-            sys._framework = None  # ruff:ignore[private-member-access]  # disable macOS static paths for framework
+            sys._framework = None  # ty: ignore[invalid-assignment]  # ruff:ignore[private-member-access]  # disable macOS static paths for framework
 
         with warnings.catch_warnings():  # disable warning for PEP-632
             warnings.simplefilter("ignore")

{python_discovery-1.6.1 → python_discovery-1.6.3}/src/python_discovery/_py_spec.py

@@ -50,6 +50,9 @@ def _int_or_none(val: str | None) -> int | None:
 
 def _parse_version_parts(version: str) -> tuple[int | None, int | None, int | None]:
     versions = tuple(int(i) for i in version.split(".") if i)
+    if not versions:
+        msg = "version must contain a numeric component"
+        raise ValueError(msg)
     if len(versions) > _MAX_VERSION_PARTS:
         msg = "too many version parts"
         raise ValueError(msg)

{python_discovery-1.6.1 → python_discovery-1.6.3}/src/python_discovery/_windows/_pep514.py

@@ -125,7 +125,10 @@ def load_exe(hive_name: str, company: str, company_key: Any, tag: str) -> tuple[
     try:
         with winreg.OpenKeyEx(company_key, rf"{tag}\InstallPath") as ip_key, ip_key:  # ty: ignore[unresolved-attribute]
             if (exe := _resolve_exe(ip_key, key_path)) is not None and os.path.exists(exe):
-                return exe, get_value(ip_key, "ExecutableArguments")
+                if (args := get_value(ip_key, "ExecutableArguments")) is None or isinstance(args, str):
+                    return exe, args if args and args.strip() else None
+                msg(f"{key_path}/ExecutableArguments", f"expected a string, got {type(args).__name__}")
+                return None
             msg(key_path, f"could not load exe with value {exe}")
     except OSError:
         msg(f"{key_path}/InstallPath", "missing")

{python_discovery-1.6.1 → python_discovery-1.6.3}/src/python_discovery/_windows/_propose.py

@@ -36,13 +36,19 @@ def propose_interpreters(
         reverse=True,
     )
 
-    for name, major, minor, arch, threaded, exe, _ in existing:
+    for name, major, minor, arch, threaded, exe, executable_args in existing:
         implementation = _IMPLEMENTATION_BY_ORG.get(name, name)
 
         skip_pre_filter = implementation.lower() != "cpython"
         registry_spec = PythonSpec("", implementation, major, minor, None, arch, exe, free_threaded=threaded)
         if skip_pre_filter or registry_spec.satisfies(spec):
-            interpreter = Pep514PythonInfo.from_exe(exe, cache, env=env, raise_on_error=False)
+            interpreter = Pep514PythonInfo._from_exe_with_args(  # ruff:ignore[private-member-access]
+                exe,
+                cache,
+                env=env,
+                executable_args=executable_args,
+                raise_on_error=False,
+            )
             if interpreter is not None and interpreter.satisfies(spec, impl_must_match=True):
                 yield interpreter