♻️ refactor(tests): stop importing private modules directly

Use from-imports and mocker.patch string paths instead of importing
private modules as objects for monkeypatching.

Signed-off-by: Bernát Gábor <bgabor8@bloomberg.net>

Author: gaborbernat

.github/workflows/check.yaml

@@ -24,6 +24,8 @@ jobs:
           - "3.12"
           - "3.11"
           - "3.10"
+          - "3.9"
+          - "3.8"
           - type-3.8
           - type-3.14
           - dev

.github/workflows/release.yaml

@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     environment:
       name: release
-      url: https://pypi.org/project/py-discovery/${{ github.ref_name }}
+      url: https://pypi.org/project/python-discovery/${{ github.ref_name }}
     permissions:
       id-token: write
     steps:

.gitignore

@@ -2,4 +2,4 @@
 *.egg-info
 dist/
 .tox/
-/src/py_discovery/_version.py
+/src/python_discovery/_version.py

README.md

@@ -1,8 +1,8 @@
-# [`py-discovery`](https://py-discovery.readthedocs.io/en/latest/)
+# [`python-discovery`](https://python-discovery.readthedocs.io/en/latest/)
 
-[![PyPI](https://img.shields.io/pypi/v/py-discovery?style=flat-square)](https://pypi.org/project/py-discovery/)
+[![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/py-discovery.svg)](https://pypi.org/project/py-discovery/)
-[![Downloads](https://static.pepy.tech/badge/py-discovery/month)](https://pepy.tech/project/py-discovery)
-[![check](https://github.com/tox-dev/py-discovery/actions/workflows/check.yml/badge.svg)](https://github.com/tox-dev/py-discovery/actions/workflows/check.yml)
-[![Documentation Status](https://readthedocs.org/projects/py-discovery/badge/?version=latest)](https://py-discovery.readthedocs.io/en/latest/?badge=latest)
+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.yml)
+[![Documentation Status](https://readthedocs.org/projects/python-discovery/badge/?version=latest)](https://python-discovery.readthedocs.io/en/latest/?badge=latest)

docs/conf.py

@@ -1,14 +1,16 @@
+"""Sphinx configuration for python-discovery documentation."""
+
 from __future__ import annotations
 
 from datetime import datetime, timezone
 
-from py_discovery import __version__
+from python_discovery import __version__
 
 company = "tox-dev"
-name = "py-discovery"
+name = "python-discovery"
 version = ".".join(__version__.split(".")[:2])
 release = __version__
-copyright = f"2024-{datetime.now(tz=timezone.utc).year}, {company}"  # noqa: A001
+copyright = f"2026-{datetime.now(tz=timezone.utc).year}, {company}"  # noqa: A001
 
 extensions = [
     "sphinx.ext.autodoc",

docs/explanation.rst

@@ -1,10 +1,10 @@
 How it works
 ============
 
-Where does py-discovery look?
+Where does python-discovery look?
 -------------------------------
 
-When you call :func:`~py_discovery.get_interpreter`, the library checks several locations in
+When you call :func:`~python_discovery.get_interpreter`, the library checks several locations in
 order. It stops as soon as it finds an interpreter that matches your spec.
 
 .. mermaid::
@@ -44,7 +44,7 @@ How version-manager shims are handled
 -----------------------------------------
 
 Version managers like `pyenv <https://github.com/pyenv/pyenv>`_ install thin wrapper scripts called
-**shims** (e.g., ``~/.pyenv/shims/python3.12``) that redirect to the real interpreter. py-discovery
+**shims** (e.g., ``~/.pyenv/shims/python3.12``) that redirect to the real interpreter. python-discovery
 detects these shims and resolves them to the actual binary.
 
 .. mermaid::
@@ -85,7 +85,7 @@ work by storing the result as a JSON file keyed by the interpreter's path.
         style Return fill:#4a9f4a,stroke:#2a6f2a,color:#fff
         style Run fill:#d9904a,stroke:#8f5f2a,color:#fff
 
-The built-in :class:`~py_discovery.DiskCache` stores files under ``<root>/py_info/4/<sha256>.json``
+The built-in :class:`~python_discovery.DiskCache` stores files under ``<root>/py_info/4/<sha256>.json``
 with `filelock <https://py-filelock.readthedocs.io/>`_-based locking for safe concurrent access. You
 can also pass ``cache=None`` to disable caching, or implement your own backend (see
 :doc:`/how-to/standalone-usage`).

docs/how-to/standalone-usage.rst

@@ -10,7 +10,7 @@ standard locations.
 
 .. code-block:: python
 
-   from py_discovery import get_interpreter
+   from python_discovery import get_interpreter
 
    info = get_interpreter("python3.12", try_first_with=["/opt/python/bin"])
    if info is not None:
@@ -19,7 +19,7 @@ standard locations.
 Restrict the search environment
 ---------------------------------
 
-By default, py-discovery reads environment variables like ``PATH`` and ``PYENV_ROOT`` from your
+By default, python-discovery reads environment variables like ``PATH`` and ``PYENV_ROOT`` from your
 shell. You can override these to control exactly where the library looks.
 
 .. mermaid::
@@ -37,15 +37,15 @@ shell. You can override these to control exactly where the library looks.
 
    import os
 
-   from py_discovery import get_interpreter
+   from python_discovery import get_interpreter
 
    env = {**os.environ, "PATH": "/usr/local/bin:/usr/bin"}
    result = get_interpreter("python3.12", env=env)
 
 Read interpreter metadata
 ---------------------------
 
-Once you have a :class:`~py_discovery.PythonInfo`, you can inspect everything about the interpreter.
+Once you have a :class:`~python_discovery.PythonInfo`, you can inspect everything about the interpreter.
 
 .. mermaid::
 
@@ -67,9 +67,9 @@ Once you have a :class:`~py_discovery.PythonInfo`, you can inspect everything ab
 
    from pathlib import Path
 
-   from py_discovery import DiskCache, get_interpreter
+   from python_discovery import DiskCache, get_interpreter
 
-   cache = DiskCache(root=Path("~/.cache/py-discovery").expanduser())
+   cache = DiskCache(root=Path("~/.cache/python-discovery").expanduser())
    info = get_interpreter("python3.12", cache=cache)
 
    info.executable           # Resolved path to the binary.
@@ -86,9 +86,9 @@ Once you have a :class:`~py_discovery.PythonInfo`, you can inspect everything ab
 Implement a custom cache backend
 -----------------------------------
 
-The built-in :class:`~py_discovery.DiskCache` stores results as JSON files with
+The built-in :class:`~python_discovery.DiskCache` stores results as JSON files with
 `filelock <https://py-filelock.readthedocs.io/>`_-based locking. If you need a different storage
-strategy (e.g., in-memory, database-backed), implement the :class:`~py_discovery.PyInfoCache`
+strategy (e.g., in-memory, database-backed), implement the :class:`~python_discovery.PyInfoCache`
 protocol.
 
 .. mermaid::
@@ -117,7 +117,7 @@ protocol.
 
    from pathlib import Path
 
-   from py_discovery import ContentStore, PyInfoCache
+   from python_discovery import ContentStore, PyInfoCache
 
 
    class MyContentStore:

docs/index.rst

@@ -1,10 +1,10 @@
-py-discovery
+python-discovery
 ============
 
 You may have multiple Python versions installed on your machine -- system Python, versions from
 `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`). ``py-discovery`` finds the right one for you.
+(:pep:`514`). ``python-discovery`` 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
@@ -14,9 +14,9 @@ repeated lookups are fast.
 
    from pathlib import Path
 
-   from py_discovery import DiskCache, get_interpreter
+   from python_discovery import DiskCache, get_interpreter
 
-   cache = DiskCache(root=Path("~/.cache/py-discovery").expanduser())
+   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

docs/reference/api.rst

@@ -1,7 +1,7 @@
 API reference
 =============
 
-.. automodule:: py_discovery
+.. automodule:: python_discovery
    :members:
    :undoc-members:
    :show-inheritance:

docs/tutorial/getting-started.rst

@@ -6,7 +6,7 @@ Installation
 
 .. code-block:: console
 
-   pip install py-discovery
+   pip install python-discovery
 
 Core concepts
 -------------
@@ -39,24 +39,24 @@ The simplest use case: get information about the Python that is running right no
 
    from pathlib import Path
 
-   from py_discovery import DiskCache, PythonInfo
+   from python_discovery import DiskCache, PythonInfo
 
-   cache = DiskCache(root=Path("~/.cache/py-discovery").expanduser())
+   cache = DiskCache(root=Path("~/.cache/python-discovery").expanduser())
    info = PythonInfo.current_system(cache)
 
    print(info.executable)        # /usr/bin/python3.12
    print(info.version_info[:3])  # (3, 12, 1)
    print(info.implementation)    # CPython  (or PyPy, GraalPy, etc.)
    print(info.architecture)      # 64       (or 32)
 
-The returned :class:`~py_discovery.PythonInfo` object contains everything the library knows about that interpreter:
+The returned :class:`~python_discovery.PythonInfo` object contains everything the library knows about that interpreter:
 paths, version numbers, sysconfig variables, platform details, and more.
 
 Finding a different interpreter
 --------------------------------
 
 Usually you need a *specific* Python version, not the one currently running. Pass a **spec** string
-to :func:`~py_discovery.get_interpreter` to search your system.
+to :func:`~python_discovery.get_interpreter` to search your system.
 
 .. mermaid::
 
@@ -74,9 +74,9 @@ to :func:`~py_discovery.get_interpreter` to search your system.
 
    from pathlib import Path
 
-   from py_discovery import DiskCache, get_interpreter
+   from python_discovery import DiskCache, get_interpreter
 
-   cache = DiskCache(root=Path("~/.cache/py-discovery").expanduser())
+   cache = DiskCache(root=Path("~/.cache/python-discovery").expanduser())
    result = get_interpreter("python3.12", cache=cache)
    if result is not None:
        print(result.executable)
@@ -90,7 +90,7 @@ You can pass multiple specs as a list -- the library tries each one in order and
 Writing specs
 -------------
 
-A spec tells py-discovery what to look for. The simplest form is just a version number like ``3.12``.
+A spec tells python-discovery what to look for. The simplest form is just a version number like ``3.12``.
 You can add more constraints to narrow the search.
 
 .. mermaid::
@@ -139,7 +139,7 @@ Parsing a spec
 --------------
 
 You can parse a spec string into its components without searching the system. This is useful for
-inspecting what a spec means or for building tools on top of py-discovery.
+inspecting what a spec means or for building tools on top of python-discovery.
 
 .. mermaid::
 
@@ -157,7 +157,7 @@ inspecting what a spec means or for building tools on top of py-discovery.
 
 .. code-block:: python
 
-   from py_discovery import PythonSpec
+   from python_discovery import PythonSpec
 
    spec = PythonSpec.from_string_spec("cpython3.12t-64-arm64")
    spec.implementation   # "cpython"
@@ -175,6 +175,6 @@ Every call will run a subprocess to query the interpreter, so this is slower for
 
 .. code-block:: python
 
-   from py_discovery import get_interpreter
+   from python_discovery import get_interpreter
 
    result = get_interpreter("python3.12")