python-discovery 1.2.0__tar.gz → 1.2.2__tar.gz

{python_discovery-1.2.0 → python_discovery-1.2.2}/.github/dependabot.yaml

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

{python_discovery-1.2.0 → python_discovery-1.2.2}/.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@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
         with:
-          enable-cache: true
+          enable-cache: false
           cache-dependency-glob: "pyproject.toml"
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install tox

{python_discovery-1.2.0 → python_discovery-1.2.2}/.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@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
         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.2.0 → python_discovery-1.2.2}/.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.37.0
+    rev: 0.37.1
     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.18.1"
+    rev: "v2.21.0"
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.15.6"
+    rev: "v0.15.9"
     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.2.0 → python_discovery-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-discovery
-Version: 1.2.0
+Version: 1.2.2
 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.2.2/docs/changelog/59.bugfix.rst

@@ -0,0 +1 @@
+export normalize_isa and deprecate KNOWN_ARCHITECTURES - by :user:`rahuldevikar`.

{python_discovery-1.2.0 → python_discovery-1.2.2}/docs/conf.py

@@ -21,13 +21,19 @@ extensions = [
     "sphinxcontrib.mermaid",
 ]
 
+extlinks = {
+    "issue": ("https://github.com/tox-dev/python-discovery/issues/%s", "#%s"),
+    "pull": ("https://github.com/tox-dev/python-discovery/pull/%s", "PR #%s"),
+    "user": ("https://github.com/%s", "@%s"),
+}
+
 intersphinx_mapping = {
     "python": ("https://docs.python.org/3", None),
 }
 
 templates_path = []
 source_suffix = ".rst"
-exclude_patterns = ["_build"]
+exclude_patterns = ["_build", "changelog/*.rst"]
 
 main_doc = "index"
 pygments_style = "default"

{python_discovery-1.2.0 → python_discovery-1.2.2}/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, normalize_isa
 from ._py_spec import PythonSpec
 from ._specifier import SimpleSpecifier, SimpleSpecifierSet, SimpleVersion
 
 __version__ = version("python-discovery")
 
 __all__ = [
+    "KNOWN_ARCHITECTURES",
     "ContentStore",
     "DiskCache",
     "PyInfoCache",
@@ -23,4 +24,5 @@ __all__ = [
     "SimpleVersion",
     "__version__",
     "get_interpreter",
+    "normalize_isa",
 ]

{python_discovery-1.2.0 → python_discovery-1.2.2}/src/python_discovery/_py_info.py

@@ -768,9 +768,45 @@ class PythonInfo:  # noqa: PLR0904
                     yield upper
 
 
+KNOWN_ARCHITECTURES: frozenset[str] = frozenset({
+    "arm64",
+    "loongarch64",
+    "ppc",
+    "ppc64",
+    "ppc64le",
+    "riscv64",
+    "s390x",
+    "sparc64",
+    "x86",
+    "x86_64",
+})
+"""Known CPU architecture (ISA) values after normalization.
+
+.. deprecated::
+    Use :func:`normalize_isa` instead, which handles both known and unknown architectures.
+"""
+
+
 def normalize_isa(isa: str) -> str:
+    """
+    Normalize an ISA (instruction set architecture) string to a canonical form.
+
+    Known aliases are mapped (e.g. ``amd64`` → ``x86_64``, ``aarch64`` → ``arm64``).
+    Unrecognized values are lowercased and returned as-is.
+    """
     low = isa.lower()
-    return {"amd64": "x86_64", "aarch64": "arm64"}.get(low, low)
+    return {
+        "amd64": "x86_64",
+        "aarch64": "arm64",
+        "i386": "x86",
+        "i486": "x86",
+        "i586": "x86",
+        "i686": "x86",
+        "powerpc": "ppc",
+        "powerpc64": "ppc64",
+        "powerpc64le": "ppc64le",
+        "sparcv9": "sparc64",
+    }.get(low, low)
 
 
 def _main() -> None:  # pragma: no cover

{python_discovery-1.2.0 → python_discovery-1.2.2}/tests/py_info/test_py_info.py

@@ -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 == machine.lower(), f"machine value should be lowercase: {machine}"
 
 
 def test_py_info_machine_in_spec() -> None:

{python_discovery-1.2.0 → python_discovery-1.2.2}/tests/test_py_spec.py

@@ -217,9 +217,19 @@ def test_spec_satisfies_machine(left: str, right: str, expected: bool) -> None:
         pytest.param("x86_64", "x86_64", id="x86_64"),
         pytest.param("arm64", "arm64", id="arm64"),
         pytest.param("x86", "x86", id="x86"),
+        pytest.param("i386", "x86", id="i386"),
+        pytest.param("i486", "x86", id="i486"),
+        pytest.param("i586", "x86", id="i586"),
+        pytest.param("i686", "x86", id="i686"),
         pytest.param("ppc64le", "ppc64le", id="ppc64le"),
+        pytest.param("powerpc", "ppc", id="powerpc"),
+        pytest.param("powerpc64", "ppc64", id="powerpc64"),
+        pytest.param("powerpc64le", "ppc64le", id="powerpc64le"),
         pytest.param("riscv64", "riscv64", id="riscv64"),
         pytest.param("s390x", "s390x", id="s390x"),
+        pytest.param("sparcv9", "sparc64", id="sparcv9"),
+        pytest.param("sparc64", "sparc64", id="sparc64"),
+        pytest.param("alpha", "alpha", id="alpha-passthrough"),
     ],
 )
 def test_normalize_isa(isa: str, normalized: str) -> None:

{python_discovery-1.2.0 → python_discovery-1.2.2}/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"