python-discovery 1.1.0__tar.gz → 1.1.1__tar.gz

python_discovery-1.1.1/.github/FUNDING.yaml

@@ -0,0 +1 @@
+github: gaborbernat

python_discovery-1.1.1/.github/SECURITY.md

@@ -0,0 +1,9 @@
+# Security Policy
+
+## Supported Versions
+
+Only the latest released version is supported with security updates. Older versions will not receive patches.
+
+## Reporting a Vulnerability
+
+Please report security vulnerabilities via [GitHub's private vulnerability reporting](../../security/advisories/new).

python_discovery-1.1.1/.github/release.yaml

@@ -0,0 +1,5 @@
+changelog:
+  exclude:
+    authors:
+      - dependabot[bot]
+      - pre-commit-ci[bot]

{python_discovery-1.1.0 → python_discovery-1.1.1}/.github/workflows/check.yaml

@@ -12,6 +12,9 @@ concurrency:
   group: check-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   test:
     runs-on: ubuntu-latest

{python_discovery-1.1.0 → python_discovery-1.1.1}/.github/workflows/release.yaml

@@ -3,6 +3,9 @@ on:
   push:
     tags: ["*"]
 
+permissions:
+  contents: read
+
 env:
   dists-artifact-name: python-package-distributions
 
@@ -22,7 +25,7 @@ jobs:
       - 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@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ env.dists-artifact-name }}
           path: dist/*
@@ -38,7 +41,7 @@ jobs:
       id-token: write
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: ${{ env.dists-artifact-name }}
           path: dist/

{python_discovery-1.1.0 → python_discovery-1.1.1}/.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.36.1
+    rev: 0.37.0
     hooks:
       - id: check-github-workflows
         args: ["--verbose"]
@@ -15,11 +15,11 @@ repos:
       - id: codespell
         additional_dependencies: ["tomli>=2.4"]
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "v2.11.1"
+    rev: "v2.16.2"
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.14.14"
+    rev: "v0.15.4"
     hooks:
       - id: ruff-format
       - id: ruff

{python_discovery-1.1.0 → python_discovery-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-discovery
-Version: 1.1.0
+Version: 1.1.1
 Summary: Python interpreter discovery
 Project-URL: Changelog, https://github.com/tox-dev/python-discovery/releases
 Project-URL: Documentation, https://python-discovery.readthedocs.io
@@ -67,5 +67,5 @@ Description-Content-Type: text/markdown
 [![Supported Python
 versions](https://img.shields.io/pypi/pyversions/python-discovery.svg)](https://pypi.org/project/python-discovery/)
 [![Downloads](https://static.pepy.tech/badge/python-discovery/month)](https://pepy.tech/project/python-discovery)
-[![check](https://github.com/tox-dev/python-discovery/actions/workflows/check.yml/badge.svg)](https://github.com/tox-dev/python-discovery/actions/workflows/check.yaml)
+[![check](https://github.com/tox-dev/python-discovery/actions/workflows/check.yaml/badge.svg)](https://github.com/tox-dev/python-discovery/actions/workflows/check.yaml)
 [![Documentation Status](https://readthedocs.org/projects/python-discovery/badge/?version=latest)](https://python-discovery.readthedocs.io/en/latest/?badge=latest)

{python_discovery-1.1.0 → python_discovery-1.1.1}/README.md

@@ -4,5 +4,5 @@
 [![Supported Python
 versions](https://img.shields.io/pypi/pyversions/python-discovery.svg)](https://pypi.org/project/python-discovery/)
 [![Downloads](https://static.pepy.tech/badge/python-discovery/month)](https://pepy.tech/project/python-discovery)
-[![check](https://github.com/tox-dev/python-discovery/actions/workflows/check.yml/badge.svg)](https://github.com/tox-dev/python-discovery/actions/workflows/check.yaml)
+[![check](https://github.com/tox-dev/python-discovery/actions/workflows/check.yaml/badge.svg)](https://github.com/tox-dev/python-discovery/actions/workflows/check.yaml)
 [![Documentation Status](https://readthedocs.org/projects/python-discovery/badge/?version=latest)](https://python-discovery.readthedocs.io/en/latest/?badge=latest)

{python_discovery-1.1.0 → python_discovery-1.1.1}/pyproject.toml

@@ -129,31 +129,20 @@ count = true
 [tool.pyproject-fmt]
 max_supported_python = "3.14"
 
-[tool.pytest.ini_options]
-markers = [ "graalpy" ]
+[tool.pytest]
+ini_options.markers = [ "graalpy" ]
 
 [tool.coverage]
-run.source = [
-  "python_discovery",
-  "tests",
-]
-run.dynamic_context = "test_function"
 run.branch = true
+run.dynamic_context = "test_function"
 run.parallel = true
 run.plugins = [
   "covdefaults",
 ]
-report.fail_under = 100
-report.show_missing = true
-report.partial_branches = [
-  "assert any\\(",
-]
-report.omit = [
-  "src/python_discovery/_windows/*",
-  "tests/windows/*",
+run.source = [
+  "python_discovery",
+  "tests",
 ]
-html.show_contexts = true
-html.skip_covered = false
 paths.source = [
   "src",
   ".tox*/*/lib/python*/site-packages",
@@ -162,6 +151,17 @@ paths.source = [
   "*/src",
   "*\\src",
 ]
+report.fail_under = 100
+report.omit = [
+  "src/python_discovery/_windows/*",
+  "tests/windows/*",
+]
+report.partial_branches = [
+  "assert any\\(",
+]
+report.show_missing = true
+html.show_contexts = true
+html.skip_covered = false
 
 [tool.ty]
 src.exclude = [ "tests/windows/winreg_mock_values.py" ]

{python_discovery-1.1.0 → python_discovery-1.1.1}/src/python_discovery/_cached_py_info.py

@@ -15,7 +15,7 @@ from collections import OrderedDict
 from contextlib import contextmanager
 from pathlib import Path
 from shlex import quote
-from subprocess import Popen  # noqa: S404
+from subprocess import Popen, TimeoutExpired  # noqa: S404
 from typing import TYPE_CHECKING, Final
 
 from ._cache import NoOpCache
@@ -206,8 +206,11 @@ def _run_subprocess(
                 encoding="utf-8",
                 errors="backslashreplace",
             )
-            out, err = process.communicate()
+            out, err = process.communicate(timeout=5)
             code = process.returncode
+        except TimeoutExpired:
+            process.kill()
+            out, err, code = "", "timed out", -1
         except OSError as os_error:
             out, err, code = "", os_error.strerror, os_error.errno
     if code != 0:

{python_discovery-1.1.0 → python_discovery-1.1.1}/tests/conftest.py

@@ -26,4 +26,5 @@ def _ensure_py_info_cache_empty(session_cache: DiskCache) -> Generator[None]:
 def _skip_if_test_in_system(session_cache: DiskCache) -> None:
     current = PythonInfo.current(session_cache)
     if current.system_executable is not None:  # pragma: no cover
-        pytest.skip("test not valid if run under system")
+        msg = "test not valid if run under system"
+        raise pytest.skip.Exception(msg)

{python_discovery-1.1.0 → python_discovery-1.1.1}/tests/py_info/test_py_info.py

@@ -338,7 +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", "x86_64", "x86", "ppc64le", "ppc64", "s390x", "riscv64"}
+    known_isas = {"arm64", "i686", "ppc64", "ppc64le", "riscv64", "s390x", "x86", "x86_64"}
     assert machine in known_isas, f"unexpected machine value: {machine}"
 
 

{python_discovery-1.1.0 → python_discovery-1.1.1}/tests/test_cached_py_info.py

@@ -5,6 +5,7 @@ import logging
 import os
 import sys
 from pathlib import Path
+from subprocess import TimeoutExpired
 from typing import TYPE_CHECKING
 from unittest.mock import MagicMock, patch
 
@@ -110,6 +111,17 @@ def test_run_subprocess_with_cookies(mocker: MockerFixture) -> None:
     assert mock_stdout.write.call_count == 2
 
 
+def test_run_subprocess_timeout(mocker: MockerFixture) -> None:
+    mock_process = MagicMock()
+    mock_process.communicate.side_effect = TimeoutExpired(cmd="python", timeout=30)
+    mocker.patch("python_discovery._cached_py_info.Popen", return_value=mock_process)
+    failure, result = _run_subprocess(PythonInfo, sys.executable, dict(os.environ))
+    assert failure is not None
+    assert "timed out" in str(failure)
+    assert result is None
+    mock_process.kill.assert_called_once()
+
+
 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.0/.github/release.yml

@@ -1,5 +0,0 @@
-changelog:
-  exclude:
-    authors:
-      - dependabot
-      - pre-commit-ci