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

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

@@ -10,7 +10,7 @@ repos:
       - id: check-github-workflows
         args: ["--verbose"]
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
+    rev: v2.4.2
     hooks:
       - id: codespell
         additional_dependencies: ["tomli>=2.4"]
@@ -19,7 +19,7 @@ repos:
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.15.4"
+    rev: "v0.15.5"
     hooks:
       - id: ruff-format
       - id: ruff

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-discovery
-Version: 1.1.1
+Version: 1.1.3
 Summary: Python interpreter discovery
 Project-URL: Changelog, https://github.com/tox-dev/python-discovery/releases
 Project-URL: Documentation, https://python-discovery.readthedocs.io
@@ -64,8 +64,43 @@ Description-Content-Type: text/markdown
 # [`python-discovery`](https://python-discovery.readthedocs.io/en/latest/)
 
 [![PyPI](https://img.shields.io/pypi/v/python-discovery?style=flat-square)](https://pypi.org/project/python-discovery/)
-[![Supported Python
-versions](https://img.shields.io/pypi/pyversions/python-discovery.svg)](https://pypi.org/project/python-discovery/)
+[![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.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)
+
+## What is python-discovery?
+
+`python-discovery` is a library for discovering Python interpreters installed on your machine. You may have multiple
+Python versions from system packages, [pyenv](https://github.com/pyenv/pyenv), [mise](https://mise.jdx.dev/),
+[asdf](https://asdf-vm.com/), [uv](https://docs.astral.sh/uv/), or the Windows registry (PEP 514). This library finds
+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.
+
+## Usage
+
+```python
+from pathlib import Path
+
+from python_discovery import DiskCache, get_interpreter
+
+cache = DiskCache(root=Path("~/.cache/python-discovery").expanduser())
+result = get_interpreter("python3.12", cache=cache)
+if result is not None:
+    print(result.executable)  # /usr/bin/python3.12
+    print(result.implementation)  # CPython
+    print(result.version_info[:3])  # (3, 12, 1)
+```
+
+The `get_interpreter()` function accepts various specification formats:
+
+- Absolute path: `/usr/bin/python3.12`
+- Version: `3.12`
+- Implementation prefix: `cpython3.12`
+- PEP 440 specifier: `>=3.10`, `>=3.11,<3.13`
+
+## Documentation
+
+Full documentation is available at [python-discovery.readthedocs.io](https://python-discovery.readthedocs.io/en/latest/)

python_discovery-1.1.3/README.md

@@ -0,0 +1,43 @@
+# [`python-discovery`](https://python-discovery.readthedocs.io/en/latest/)
+
+[![PyPI](https://img.shields.io/pypi/v/python-discovery?style=flat-square)](https://pypi.org/project/python-discovery/)
+[![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.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)
+
+## What is python-discovery?
+
+`python-discovery` is a library for discovering Python interpreters installed on your machine. You may have multiple
+Python versions from system packages, [pyenv](https://github.com/pyenv/pyenv), [mise](https://mise.jdx.dev/),
+[asdf](https://asdf-vm.com/), [uv](https://docs.astral.sh/uv/), or the Windows registry (PEP 514). This library finds
+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.
+
+## Usage
+
+```python
+from pathlib import Path
+
+from python_discovery import DiskCache, get_interpreter
+
+cache = DiskCache(root=Path("~/.cache/python-discovery").expanduser())
+result = get_interpreter("python3.12", cache=cache)
+if result is not None:
+    print(result.executable)  # /usr/bin/python3.12
+    print(result.implementation)  # CPython
+    print(result.version_info[:3])  # (3, 12, 1)
+```
+
+The `get_interpreter()` function accepts various specification formats:
+
+- Absolute path: `/usr/bin/python3.12`
+- Version: `3.12`
+- Implementation prefix: `cpython3.12`
+- PEP 440 specifier: `>=3.10`, `>=3.11,<3.13`
+
+## Documentation
+
+Full documentation is available at [python-discovery.readthedocs.io](https://python-discovery.readthedocs.io/en/latest/)

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

@@ -210,6 +210,7 @@ def _run_subprocess(
             code = process.returncode
         except TimeoutExpired:
             process.kill()
+            process.communicate()
             out, err, code = "", "timed out", -1
         except OSError as os_error:
             out, err, code = "", os_error.strerror, os_error.errno

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

@@ -469,12 +469,24 @@ class PythonInfo:  # noqa: PLR0904
         if spec.version_specifier is None:  # pragma: no cover
             return True
         version_info = self.version_info
-        release = f"{version_info.major}.{version_info.minor}.{version_info.micro}"
-        if version_info.releaselevel != "final":
-            suffix = {"alpha": "a", "beta": "b", "candidate": "rc"}.get(version_info.releaselevel)
-            if suffix is not None:  # pragma: no branch # releaselevel is always alpha/beta/candidate here
+        for specifier in spec.version_specifier:
+            assert specifier.version is not None  # noqa: S101
+            numeric_version = specifier.version_str
+            for prefix in ("rc", "b", "a"):
+                if prefix in numeric_version:
+                    numeric_version = numeric_version.split(prefix)[0]
+                    break
+            precision = numeric_version.count(".") + 1
+            release = ".".join(str(c) for c in [version_info.major, version_info.minor, version_info.micro][:precision])
+            if (
+                version_info.releaselevel != "final"
+                and (precision == 3 or specifier.version.pre_type is not None)  # noqa: PLR2004
+                and (suffix := {"alpha": "a", "beta": "b", "candidate": "rc"}.get(version_info.releaselevel))
+            ):
                 release = f"{release}{suffix}{version_info.serial}"
-        return spec.version_specifier.contains(release)
+            if not specifier.contains(release):
+                return False
+        return True
 
     _current_system = None
     _current = None

{python_discovery-1.1.1 → python_discovery-1.1.3}/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", "i686", "ppc64", "ppc64le", "riscv64", "s390x", "x86", "x86_64"}
+    known_isas = {"arm64", "i686", "loongarch64", "ppc64", "ppc64le", "riscv64", "s390x", "x86", "x86_64"}
     assert machine in known_isas, f"unexpected machine value: {machine}"
 
 

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

@@ -113,13 +113,14 @@ def test_run_subprocess_with_cookies(mocker: MockerFixture) -> None:
 
 def test_run_subprocess_timeout(mocker: MockerFixture) -> None:
     mock_process = MagicMock()
-    mock_process.communicate.side_effect = TimeoutExpired(cmd="python", timeout=30)
+    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()
+    assert mock_process.communicate.call_count == 2
 
 
 def test_run_subprocess_nonzero_exit(mocker: MockerFixture) -> None:

{python_discovery-1.1.1 → python_discovery-1.1.3}/tests/test_py_info_extra.py

@@ -276,25 +276,29 @@ def test_satisfies_version_specifier_fails() -> None:
     assert CURRENT.satisfies(spec, impl_must_match=False) is False
 
 
-def test_satisfies_prerelease_version() -> None:
+@pytest.mark.parametrize(
+    ("version_info", "spec_str", "expected"),
+    [
+        pytest.param(VersionInfo(3, 14, 0, "alpha", 1), ">=3.14.0a1", True, id="alpha_match_exact"),
+        pytest.param(VersionInfo(3, 14, 0, "beta", 1), ">=3.14.0b1", True, id="beta_match_exact"),
+        pytest.param(VersionInfo(3, 14, 0, "candidate", 1), ">=3.14.0rc1", True, id="rc_match_exact"),
+        pytest.param(VersionInfo(3, 15, 0, "alpha", 6), ">=3.15", True, id="prerelease_match_major_minor"),
+        pytest.param(VersionInfo(3, 15, 0, "alpha", 6), ">=3.15.0", False, id="prerelease_not_match_full_precision"),
+        pytest.param(VersionInfo(3, 15, 0, "alpha", 5), "<3.15.0a6", True, id="earlier_prerelease_less_than"),
+        pytest.param(VersionInfo(3, 15, 0, "alpha", 6), "<3.15.0a6", False, id="prerelease_not_less_than_itself"),
+        pytest.param(VersionInfo(3, 15, 0, "alpha", 6), ">=3.15.0a6", True, id="prerelease_match_itself"),
+        pytest.param(VersionInfo(3, 15, 0, "alpha", 6), ">=3.15.0a7", False, id="prerelease_not_match_later"),
+        pytest.param(VersionInfo(3, 15, 0, "final", 0), ">=3.15.0a6", True, id="final_greater_than_prerelease"),
+        pytest.param(VersionInfo(3, 15, 0, "final", 0), "<3.15.0a6", False, id="final_not_less_than_prerelease"),
+        pytest.param(VersionInfo(3, 15, 0, "final", 0), ">=3.15", True, id="final_match_major_minor"),
+        pytest.param(VersionInfo(3, 15, 1, "alpha", 1), ">=3.15.0", True, id="later_micro_prerelease_match"),
+    ],
+)
+def test_satisfies_version_specifier_prerelease(version_info: VersionInfo, spec_str: str, expected: bool) -> None:
     info = copy.deepcopy(CURRENT)
-    info.version_info = VersionInfo(3, 14, 0, "alpha", 1)
-    spec = PythonSpec.from_string_spec(">=3.14.0a1")
-    assert info.satisfies(spec, impl_must_match=False) is True
-
-
-def test_satisfies_prerelease_beta() -> None:
-    info = copy.deepcopy(CURRENT)
-    info.version_info = VersionInfo(3, 14, 0, "beta", 1)
-    spec = PythonSpec.from_string_spec(">=3.14.0b1")
-    assert info.satisfies(spec, impl_must_match=False) is True
-
-
-def test_satisfies_prerelease_candidate() -> None:
-    info = copy.deepcopy(CURRENT)
-    info.version_info = VersionInfo(3, 14, 0, "candidate", 1)
-    spec = PythonSpec.from_string_spec(">=3.14.0rc1")
-    assert info.satisfies(spec, impl_must_match=False) is True
+    info.version_info = version_info
+    spec = PythonSpec.from_string_spec(spec_str)
+    assert info.satisfies(spec, impl_must_match=False) is expected
 
 
 def test_satisfies_path_not_abs_basename_match() -> None:

python_discovery-1.1.1/README.md

@@ -1,8 +0,0 @@
-# [`python-discovery`](https://python-discovery.readthedocs.io/en/latest/)
-
-[![PyPI](https://img.shields.io/pypi/v/python-discovery?style=flat-square)](https://pypi.org/project/python-discovery/)
-[![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.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)