python-discovery 1.1.3__tar.gz → 1.2.1__tar.gz

{python_discovery-1.1.3 → python_discovery-1.2.1}/.github/dependabot.yaml

@@ -4,3 +4,5 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+    cooldown:
+      default-days: 7

{python_discovery-1.1.3 → python_discovery-1.2.1}/.github/workflows/check.yaml

@@ -34,13 +34,14 @@ jobs:
           - dev
           - pkg_meta
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           fetch-depth: 0
+          persist-credentials: false
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
         with:
-          enable-cache: true
+          enable-cache: false
           cache-dependency-glob: "pyproject.toml"
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install tox

{python_discovery-1.1.3 → python_discovery-1.2.1}/.github/workflows/release.yaml

@@ -13,19 +13,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           fetch-depth: 0
+          persist-credentials: false
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
         with:
-          enable-cache: true
+          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
       - name: Store the distribution packages
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
         with:
           name: ${{ env.dists-artifact-name }}
           path: dist/*
@@ -41,11 +42,11 @@ jobs:
       id-token: write
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
           name: ${{ env.dists-artifact-name }}
           path: dist/
       - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.13.0
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
         with:
           attestations: true

{python_discovery-1.1.3 → python_discovery-1.2.1}/.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.16.2"
+    rev: "v2.20.0"
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.15.5"
+    rev: "v0.15.7"
     hooks:
       - id: ruff-format
       - id: ruff
@@ -31,6 +31,10 @@ repos:
         additional_dependencies:
           - prettier@3.8.1
           - "@prettier/plugin-xml@3.4.2"
+  - repo: https://github.com/zizmorcore/zizmor-pre-commit
+    rev: v1.23.1
+    hooks:
+      - id: zizmor
   - repo: meta
     hooks:
       - id: check-hooks-apply

{python_discovery-1.1.3 → python_discovery-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-discovery
-Version: 1.1.3
+Version: 1.2.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.1.3 → python_discovery-1.2.1}/docs/explanation.rst

@@ -90,6 +90,26 @@ with `filelock <https://py-filelock.readthedocs.io/>`_-based locking for safe co
 can also pass ``cache=None`` to disable caching, or implement your own backend (see
 :doc:`/how-to/standalone-usage`).
 
+Subprocess timeout behavior
+----------------------------
+
+When python-discovery verifies an interpreter candidate, it runs a subprocess to query its metadata.
+On slow systems (especially Windows), Python startup can take significant time. The default timeout
+is **15 seconds** to balance responsiveness with accommodation for real-world conditions.
+
+If your system consistently hits timeouts, you can customize the timeout via the
+``PY_DISCOVERY_TIMEOUT`` environment variable (in seconds):
+
+.. code-block:: console
+
+   # Increase timeout to 30 seconds
+   export PY_DISCOVERY_TIMEOUT=30
+   python -c "from python_discovery import get_interpreter; get_interpreter('python3.12')"
+
+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.
+
 Spec format reference
 -----------------------
 

{python_discovery-1.1.3 → python_discovery-1.2.1}/docs/how-to/standalone-usage.rst

@@ -42,6 +42,26 @@ shell. You can override these to control exactly where the library looks.
    env = {**os.environ, "PATH": "/usr/local/bin:/usr/bin"}
    result = get_interpreter("python3.12", env=env)
 
+Customize interpreter query timeout
+-------------------------------------
+
+On slower systems (especially Windows), Python startup can take more than the default 15 seconds.
+If your discovery process times out when looking for interpreters, you can extend the timeout via
+the ``PY_DISCOVERY_TIMEOUT`` environment variable.
+
+.. code-block:: python
+
+   import os
+
+   from python_discovery import get_interpreter
+
+   # Increase timeout to 30 seconds for slow environments
+   env = {**os.environ, "PY_DISCOVERY_TIMEOUT": "30"}
+   result = get_interpreter("python3.12", env=env)
+
+The timeout value should be a number in seconds. Each interpreter candidate is given this much time
+to respond. If a timeout occurs, the candidate is skipped and the search continues with the next one.
+
 Read interpreter metadata
 ---------------------------
 

{python_discovery-1.1.3 → python_discovery-1.2.1}/docs/index.rst

@@ -40,6 +40,7 @@ repeated lookups are fast.
    :hidden:
 
    reference/api
+   reference/environment-variables
 
 .. toctree::
    :caption: Explanation

python_discovery-1.2.1/docs/reference/environment-variables.rst

@@ -0,0 +1,38 @@
+Environment Variables
+======================
+
+``PY_DISCOVERY_TIMEOUT``
+------------------------
+
+Controls the timeout for querying individual Python interpreters.
+
+**Type:** Float (seconds)
+
+**Default:** ``15``
+
+**Description:**
+
+When python-discovery verifies an interpreter candidate, it runs a subprocess to collect metadata
+(version, architecture, platform, etc.). On slower systems—particularly Windows with antivirus
+software or other tools—Python startup can exceed the default timeout.
+
+Setting this variable extends the allowed time for each interpreter query.
+
+**Examples:**
+
+.. code-block:: bash
+
+   # Allow interpreters 30 seconds to respond
+   export PY_DISCOVERY_TIMEOUT=30
+
+   # Or pass in Python
+   import os
+   os.environ["PY_DISCOVERY_TIMEOUT"] = "30"
+
+**Notes:**
+
+- The timeout applies per candidate, not to the entire discovery process
+- If a candidate times out, it is skipped and discovery continues with the next one
+- 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`

{python_discovery-1.1.3 → python_discovery-1.2.1}/docs/tutorial/getting-started.rst

@@ -178,3 +178,30 @@ Every call will run a subprocess to query the interpreter, so this is slower for
    from python_discovery import get_interpreter
 
    result = get_interpreter("python3.12")
+
+Handling slow interpreter queries
+----------------------------------
+
+On some systems (especially Windows with antivirus or other tools), Python startup is slow. If discovery
+times out, increase the timeout using the ``PY_DISCOVERY_TIMEOUT`` environment variable.
+
+.. code-block:: python
+
+   import os
+
+   from python_discovery import get_interpreter
+
+   # Allow up to 30 seconds per interpreter
+   os.environ["PY_DISCOVERY_TIMEOUT"] = "30"
+   result = get_interpreter("python3.12", cache=cache)
+
+Or, pass it directly in a custom environment dict:
+
+.. code-block:: python
+
+   import os
+
+   from python_discovery import get_interpreter
+
+   env = {**os.environ, "PY_DISCOVERY_TIMEOUT": "30"}
+   result = get_interpreter("python3.12", env=env, cache=cache)

{python_discovery-1.1.3 → python_discovery-1.2.1}/src/python_discovery/__init__.py

@@ -6,13 +6,14 @@ from importlib.metadata import version
 
 from ._cache import ContentStore, DiskCache, PyInfoCache
 from ._discovery import get_interpreter
-from ._py_info import PythonInfo
+from ._py_info import KNOWN_ARCHITECTURES, PythonInfo
 from ._py_spec import PythonSpec
 from ._specifier import SimpleSpecifier, SimpleSpecifierSet, SimpleVersion
 
 __version__ = version("python-discovery")
 
 __all__ = [
+    "KNOWN_ARCHITECTURES",
     "ContentStore",
     "DiskCache",
     "PyInfoCache",

{python_discovery-1.1.3 → python_discovery-1.2.1}/src/python_discovery/_cached_py_info.py

@@ -189,6 +189,7 @@ def _run_subprocess(
 ) -> tuple[Exception | None, PythonInfo | None]:
     start_cookie = gen_cookie()
     end_cookie = gen_cookie()
+    timeout = float(env.get("PY_DISCOVERY_TIMEOUT", "15"))
     with _resolve_py_info_script() as py_info_script:
         cmd = [exe, str(py_info_script), start_cookie, end_cookie]
         env = dict(env)
@@ -206,7 +207,7 @@ def _run_subprocess(
                 encoding="utf-8",
                 errors="backslashreplace",
             )
-            out, err = process.communicate(timeout=5)
+            out, err = process.communicate(timeout=timeout)
             code = process.returncode
         except TimeoutExpired:
             process.kill()

{python_discovery-1.1.3 → python_discovery-1.2.1}/src/python_discovery/_py_info.py

@@ -768,9 +768,23 @@ class PythonInfo:  # noqa: PLR0904
                     yield upper
 
 
+KNOWN_ARCHITECTURES: frozenset[str] = frozenset({
+    "arm64",
+    "i686",
+    "loongarch64",
+    "ppc64",
+    "ppc64le",
+    "riscv64",
+    "s390x",
+    "x86",
+    "x86_64",
+})
+"""Known CPU architecture (ISA) values after normalization."""
+
+
 def normalize_isa(isa: str) -> str:
     low = isa.lower()
-    return {"amd64": "x86_64", "aarch64": "arm64"}.get(low, low)
+    return {"amd64": "x86_64", "aarch64": "arm64", "i386": "x86", "i586": "x86"}.get(low, low)
 
 
 def _main() -> None:  # pragma: no cover

{python_discovery-1.1.3 → python_discovery-1.2.1}/tests/py_info/test_py_info.py

@@ -14,7 +14,7 @@ from typing import TYPE_CHECKING, NamedTuple
 import pytest
 from setuptools.dist import Distribution
 
-from python_discovery import DiskCache, PythonInfo, PythonSpec
+from python_discovery import KNOWN_ARCHITECTURES, DiskCache, PythonInfo, PythonSpec
 from python_discovery import _cached_py_info as cached_py_info
 from python_discovery._py_info import VersionInfo
 
@@ -338,8 +338,7 @@ def test_py_info_machine_property() -> None:
     assert machine is not None
     assert isinstance(machine, str)
     assert len(machine) > 0
-    known_isas = {"arm64", "i686", "loongarch64", "ppc64", "ppc64le", "riscv64", "s390x", "x86", "x86_64"}
-    assert machine in known_isas, f"unexpected machine value: {machine}"
+    assert machine in KNOWN_ARCHITECTURES, f"unexpected machine value: {machine}"
 
 
 def test_py_info_machine_in_spec() -> None:

{python_discovery-1.1.3 → python_discovery-1.2.1}/tests/test_cached_py_info.py

@@ -123,6 +123,17 @@ def test_run_subprocess_timeout(mocker: MockerFixture) -> None:
     assert mock_process.communicate.call_count == 2
 
 
+def test_run_subprocess_custom_timeout(mocker: MockerFixture) -> None:
+    mock_process = MagicMock()
+    mock_process.communicate.return_value = (json.dumps(PythonInfo().to_dict()), "")
+    mock_process.returncode = 0
+    mocker.patch("python_discovery._cached_py_info.Popen", return_value=mock_process)
+    env = dict(os.environ)
+    env["PY_DISCOVERY_TIMEOUT"] = "30"
+    _run_subprocess(PythonInfo, sys.executable, env)
+    mock_process.communicate.assert_called_once_with(timeout=30.0)
+
+
 def test_run_subprocess_nonzero_exit(mocker: MockerFixture) -> None:
     mock_process = MagicMock()
     mock_process.communicate.return_value = ("some output", "some error")

{python_discovery-1.1.3 → python_discovery-1.2.1}/pyproject.toml

@@ -129,6 +129,23 @@ count = true
 [tool.pyproject-fmt]
 max_supported_python = "3.14"
 
+[tool.ty]
+src.exclude = [ "tests/windows/winreg_mock_values.py" ]
+
+[[tool.ty.overrides]]
+include = [ "src/python_discovery/_py_info.py", "src/python_discovery/_py_spec.py" ]
+rules.unused-ignore-comment = "ignore"
+rules.invalid-argument-type = "ignore"
+rules.invalid-return-type = "ignore"
+rules.no-matching-overload = "ignore"
+
+[[tool.ty.overrides]]
+include = [ "tests/**/*.py" ]
+rules.unused-ignore-comment = "ignore"
+rules.invalid-argument-type = "ignore"
+rules.no-matching-overload = "ignore"
+rules.unresolved-attribute = "ignore"
+
 [tool.pytest]
 ini_options.markers = [ "graalpy" ]
 
@@ -162,20 +179,3 @@ report.partial_branches = [
 report.show_missing = true
 html.show_contexts = true
 html.skip_covered = false
-
-[tool.ty]
-src.exclude = [ "tests/windows/winreg_mock_values.py" ]
-
-[[tool.ty.overrides]]
-include = [ "src/python_discovery/_py_info.py", "src/python_discovery/_py_spec.py" ]
-rules.unused-ignore-comment = "ignore"
-rules.invalid-argument-type = "ignore"
-rules.invalid-return-type = "ignore"
-rules.no-matching-overload = "ignore"
-
-[[tool.ty.overrides]]
-include = [ "tests/**/*.py" ]
-rules.unused-ignore-comment = "ignore"
-rules.invalid-argument-type = "ignore"
-rules.no-matching-overload = "ignore"
-rules.unresolved-attribute = "ignore"