python-discovery 1.6.2__tar.gz → 1.6.4__tar.gz

{python_discovery-1.6.2 → python_discovery-1.6.4}/.github/dependabot.yaml

@@ -2,6 +2,10 @@ version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
+    labels:
+      - dependencies
+      - github_actions
+      - skip news
     schedule:
       interval: "weekly"
       day: "tuesday"

{python_discovery-1.6.2 → python_discovery-1.6.4}/.github/workflows/check.yaml

@@ -5,6 +5,7 @@ on:
     branches: ["main"]
     tags-ignore: ["**"]
   pull_request:
+    types: [opened, synchronize, reopened, labeled, unlabeled]
   schedule:
     - cron: "0 8 * * *"
 concurrency:
@@ -37,7 +38,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
         with:
           python-version: "3.15"
           enable-cache: false
@@ -63,7 +64,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
         with:
           python-version: "3.15"
           enable-cache: false
@@ -80,3 +81,32 @@ jobs:
             run: tasks/old_target_check.sh 3.5 rejected
           - name: Reject Python 2.7
             run: tasks/old_target_check.sh 2.7 rejected
+  changelog:
+    if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip news')
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+      - uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
+        with:
+          python-version: "3.15"
+          enable-cache: false
+      - run: uvx towncrier check --compare-with "origin/${GITHUB_BASE_REF}"
+  gate:
+    name: Required checks pass
+    if: always()
+    needs: [test, old-target, changelog]
+    runs-on: ubuntu-24.04
+    steps:
+      - env:
+          NEEDS_JSON: ${{ toJSON(needs) }}
+        run: |
+          jq -e '
+            all(
+              to_entries[];
+              .value.result == "success" or
+              (.key == "changelog" and .value.result == "skipped")
+            )
+          ' <<< "$NEEDS_JSON"

python_discovery-1.6.4/.github/workflows/prepare-release.yaml

@@ -0,0 +1,156 @@
+name: Prepare Release
+on:
+  workflow_dispatch:
+    inputs:
+      bump:
+        description: "Version bump type"
+        required: true
+        type: choice
+        options:
+          - auto
+          - major
+          - minor
+          - patch
+        default: auto
+permissions:
+  contents: read
+env:
+  FORCE_COLOR: 1
+jobs:
+  assemble:
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0 # The next version comes from the tags.
+          persist-credentials: false
+      - name: Install uv
+        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
+        with:
+          python-version: "3.15"
+          enable-cache: false
+      - name: Require a news fragment
+        run: |
+          if ! compgen -G 'docs/changelog/*.*.rst' > /dev/null; then
+            echo '::error::add a docs/changelog/*.rst fragment before preparing a release'
+            exit 1
+          fi
+      - name: Set up remote tracking
+        run: |
+          git remote -v
+          git fetch origin
+          git branch -a
+      - name: Calculate next version
+        id: version
+        env:
+          BUMP: ${{ inputs.bump }}
+        run: |
+          current=$(git describe --tags --abbrev=0 2>/dev/null || echo "0.0.0")
+          echo "Current version: $current"
+
+          IFS='.' read -r major minor patch <<< "$current"
+
+          bump_type="$BUMP"
+          if [ "$bump_type" = "auto" ]; then
+            feature_count=$(find docs/changelog -name "*.feature.rst" 2>/dev/null | wc -l)
+            breaking_count=$(find docs/changelog -name "*.breaking.rst" 2>/dev/null | wc -l)
+            if [ "$breaking_count" -gt 0 ]; then
+              bump_type="major"
+              echo "Auto-detected: major bump (found $breaking_count breaking changelog(s))"
+            elif [ "$feature_count" -gt 0 ]; then
+              bump_type="minor"
+              echo "Auto-detected: minor bump (found $feature_count feature changelog(s))"
+            else
+              bump_type="patch"
+              echo "Auto-detected: patch bump (no feature changelogs)"
+            fi
+          fi
+
+          case "$bump_type" in
+            major)
+              next="$((major + 1)).0.0"
+              ;;
+            minor)
+              next="$major.$((minor + 1)).0"
+              ;;
+            patch)
+              next="$major.$minor.$((patch + 1))"
+              ;;
+          esac
+
+          echo "Next version: $next"
+          echo "version=$next" >> "$GITHUB_OUTPUT"
+      - name: Build release patch
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
+        run: |
+          set -euo pipefail
+          uvx towncrier build --yes --version "$VERSION"
+          uvx --with pre-commit-uv pre-commit run --files docs/changelog.rst ||
+            uvx --with pre-commit-uv pre-commit run --files docs/changelog.rst
+          git diff HEAD --binary > "$RUNNER_TEMP/release.patch"
+          test -s "$RUNNER_TEMP/release.patch"
+      - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        with:
+          name: release-patch
+          path: ${{ runner.temp }}/release.patch
+          if-no-files-found: error
+  push:
+    needs: assemble
+    runs-on: ubuntu-24.04
+    environment: release-auth
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+      - uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        with:
+          name: release-patch
+          path: ${{ runner.temp }}/release-patch
+      - name: Validate release patch
+        env:
+          VERSION: ${{ needs.assemble.outputs.version }}
+        run: |
+          set -euo pipefail
+          git fetch origin main
+          git reset --hard origin/main
+          git apply --check "$RUNNER_TEMP/release-patch/release.patch"
+          git apply --index "$RUNNER_TEMP/release-patch/release.patch"
+          while IFS= read -r path; do
+            case "$path" in
+              docs/changelog.rst|docs/changelog/*.rst) ;;
+              *) echo "::error::unexpected release path: $path"; exit 1 ;;
+            esac
+          done < <(git diff --cached --name-only)
+          grep -qE "^ v${VERSION//./\\.} \(" docs/changelog.rst
+          git diff --cached --check
+      - id: token
+        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
+        with:
+          client-id: ${{ vars.RELEASE_APP_CLIENT_ID }}
+          private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: ${{ github.event.repository.name }}
+          permission-contents: write
+      - name: Commit and tag the release
+        env:
+          VERSION: ${{ needs.assemble.outputs.version }}
+          GH_TOKEN: ${{ steps.token.outputs.token }}
+          APP_SLUG: ${{ steps.token.outputs.app-slug }}
+        run: |
+          set -euo pipefail
+          app_user_id=$(gh api "/users/${APP_SLUG}[bot]" --jq .id)
+          git config user.name "${APP_SLUG}[bot]"
+          git config user.email "${app_user_id}+${APP_SLUG}[bot]@users.noreply.github.com"
+          git commit -m "release $VERSION"
+          git tag -a "$VERSION" -m "release $VERSION"
+          gh auth setup-git --hostname github.com --force
+          git push --atomic origin HEAD:main "refs/tags/$VERSION"

python_discovery-1.6.4/.github/workflows/release.yaml

@@ -0,0 +1,105 @@
+name: Release to PyPI
+on:
+  push:
+    tags: ["*"]
+permissions:
+  contents: read
+env:
+  dists-artifact-name: python-package-distributions
+jobs:
+  build:
+    runs-on: ubuntu-26.04
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+      - name: Require a changelog section for the tag
+        env:
+          TAG: ${{ github.ref_name }}
+        run: |
+          if [[ ! "$TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "::error::unexpected release tag $TAG"
+            exit 1
+          fi
+          if ! grep -qE "^ v${TAG//./\\.} \\(" docs/changelog.rst; then
+            echo "::error::docs/changelog.rst has no section for $TAG"
+            exit 1
+          fi
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.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.15 --python-preference only-managed --sdist --wheel . --out-dir dist
+      - name: Store the distribution packages
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        with:
+          name: ${{ env.dists-artifact-name }}
+          path: dist/*
+  release:
+    needs:
+      - build
+    runs-on: ubuntu-26.04
+    environment:
+      name: release
+      url: https://pypi.org/project/python-discovery/${{ github.ref_name }}
+    permissions:
+      id-token: write
+    steps:
+      - name: Download all the dists
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        with:
+          name: ${{ env.dists-artifact-name }}
+          path: dist/
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2
+        with:
+          attestations: true
+  github-release:
+    needs: release
+    runs-on: ubuntu-26.04
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+      - name: Publish GitHub Release
+        env:
+          GH_TOKEN: ${{ github.token }}
+          TAG: ${{ github.ref_name }}
+        run: |
+          set -euo pipefail
+          awk -v tag="$TAG" '
+            index($0, " v" tag " (") == 1 { found = 1; next }
+            found && /^ v[0-9]+\.[0-9]+\.[0-9]+ \(/ { exit }
+            found && $0 !~ /^\*+$/ { print }
+          ' docs/changelog.rst > "$RUNNER_TEMP/release-notes.md"
+          python3 - "$RUNNER_TEMP/release-notes.md" <<'PY'
+          import re
+          import sys
+          from pathlib import Path
+
+          path = Path(sys.argv[1])
+          body = path.read_text().strip()
+          if not body:
+              raise SystemExit("release notes are empty")
+          body = re.sub(r":user:`([^`]+)`", r"\1", body)
+          body = re.sub(r":(?:issue|pull):`(\d+)`", r"#\1", body)
+          body = re.sub(r":[a-z]+:`~?([^`]+)`", lambda match: f"`{match.group(1).split('.')[-1]}`", body)
+          path.write_text(body.replace("``", "`") + "\n")
+          PY
+          test -s "$RUNNER_TEMP/release-notes.md"
+          printf '\n[PyPI release](https://pypi.org/project/python-discovery/%s/)\n' "$TAG" >> "$RUNNER_TEMP/release-notes.md"
+          previous=$(git tag --list '[0-9]*' | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | awk -v tag="$TAG" '$0 == tag { print previous; exit } { previous = $0 }')
+          if [[ -n "$previous" ]]; then
+            printf '\n**Full Changelog**: https://github.com/%s/compare/%s...%s\n' "$GITHUB_REPOSITORY" "$previous" "$TAG" >> "$RUNNER_TEMP/release-notes.md"
+          else
+            printf '\n**Full Changelog**: https://github.com/%s/commits/%s\n' "$GITHUB_REPOSITORY" "$TAG" >> "$RUNNER_TEMP/release-notes.md"
+          fi
+          gh release create "$TAG" --verify-tag --title "v$TAG" --notes-file "$RUNNER_TEMP/release-notes.md"

{python_discovery-1.6.2 → python_discovery-1.6.4}/.pre-commit-config.yaml

@@ -16,11 +16,11 @@ repos:
     hooks:
       - id: codespell
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "v2.30.1"
+    rev: "v2.30.3"
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.16.10"
+    rev: "v0.17.0"
     hooks:
       - id: ruff-format
       - id: ruff

{python_discovery-1.6.2 → python_discovery-1.6.4}/PKG-INFO

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

@@ -6,6 +6,26 @@
 
 .. towncrier release notes start
 
+********************
+ v1.6.4 (2026-10-19)
+********************
+
+Improved documentation - 1.6.4
+==============================
+- Clarify the executable paths accepted by ``try_first_with`` in the standalone usage example. (:issue:`150`)
+
+********************
+ v1.6.3 (2026-10-16)
+********************
+
+Bug fixes - 1.6.3
+=================
+- Treat specs with dot-only version components, such as ``python.``, as literal executable paths instead of raising
+  ``IndexError`` - by :user:`harbinresearcher`. (:issue:`147`)
+- 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`.
+  (:issue:`148`)
+
 ********************
  v1.6.2 (2026-10-10)
 ********************
@@ -61,6 +81,14 @@ 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.2 (2026-08-12)
+********************
+
+Bug fixes - 1.5.2
+=================
+- Move interpreter interrogation into a Python 3.6-compatible collector. (:issue:`117`)
+
 ********************
  v1.5.1 (2026-07-31)
 ********************

{python_discovery-1.6.2 → python_discovery-1.6.4}/docs/how-to/standalone-usage.rst

@@ -1,10 +1,10 @@
 How-to guides
 =============
 
-Search specific directories first
------------------------------------
+Try specific executables first
+------------------------------
 
-If you know a likely location for the interpreter, pass it via ``try_first_with`` to check there
+If you know the path to an interpreter executable, pass it via ``try_first_with`` to check it
 before the normal search. This is useful when you have a custom Python install outside the
 standard locations.
 
@@ -12,7 +12,7 @@ standard locations.
 
    from python_discovery import get_interpreter
 
-   info = get_interpreter("python3.12", try_first_with=["/opt/python/bin"])
+   info = get_interpreter("python3.12", try_first_with=["/opt/python/bin/python3.12"])
    if info is not None:
        print(info.executable)
 

{python_discovery-1.6.2 → python_discovery-1.6.4}/pyproject.toml

@@ -228,5 +228,4 @@ type = [
   { directory = "doc", name = "Improved documentation", showcontent = true },
   { directory = "packaging", name = "Packaging updates and notes for downstreams", showcontent = true },
   { directory = "contrib", name = "Contributor-facing changes", showcontent = true },
-  { directory = "misc", name = "Miscellaneous internal changes", showcontent = true },
 ]

{python_discovery-1.6.2 → python_discovery-1.6.4}/src/python_discovery/_cached_py_info.py

@@ -30,15 +30,16 @@ 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
@@ -58,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
@@ -69,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:
@@ -107,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)})
@@ -214,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 = _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,
@@ -248,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, "

{python_discovery-1.6.2 → python_discovery-1.6.4}/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.2 → python_discovery-1.6.4}/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.2 → python_discovery-1.6.4}/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.2 → python_discovery-1.6.4}/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