python-discovery 1.4.1__tar.gz → 1.4.3__tar.gz

{python_discovery-1.4.1 → python_discovery-1.4.3}/.github/workflows/check.yaml

@@ -34,7 +34,7 @@ jobs:
           - dev
           - pkg_meta
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
           persist-credentials: false

{python_discovery-1.4.1 → python_discovery-1.4.3}/.github/workflows/prepare-release.yaml

@@ -26,7 +26,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
           token: ${{ secrets.RELEASE_PAT }}

{python_discovery-1.4.1 → python_discovery-1.4.3}/.github/workflows/release.yaml

@@ -13,7 +13,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
           persist-credentials: false

{python_discovery-1.4.1 → python_discovery-1.4.3}/.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.2
+    rev: 0.37.3
     hooks:
       - id: check-github-workflows
         args: ["--verbose"]
@@ -15,24 +15,24 @@ repos:
       - id: codespell
         additional_dependencies: ["tomli>=2.4"]
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "v2.23.0"
+    rev: "v2.25.1"
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.15.16"
+    rev: "v0.15.20"
     hooks:
       - id: ruff-format
       - id: ruff
         args: ["--fix", "--unsafe-fixes", "--exit-non-zero-on-fix"]
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: "v3.8.3"
+    rev: "v3.9.1"
     hooks:
       - id: prettier
         additional_dependencies:
           - prettier@3.8.1
           - "@prettier/plugin-xml@3.4.2"
   - repo: https://github.com/zizmorcore/zizmor-pre-commit
-    rev: v1.25.2
+    rev: v1.26.1
     hooks:
       - id: zizmor
   - repo: meta

{python_discovery-1.4.1 → python_discovery-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-discovery
-Version: 1.4.1
+Version: 1.4.3
 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.4.1 → python_discovery-1.4.3}/docs/changelog.rst

@@ -6,6 +6,26 @@
 
 .. towncrier release notes start
 
+********************
+ v1.4.3 (2026-07-03)
+********************
+
+Packaging updates and notes for downstreams - 1.4.3
+===================================================
+- Constrain the ``hatchling`` build requirement per Python version so sdist builds resolve a compatible backend on the
+  declared ``>=3.8`` floor - ``hatchling>=1.28`` dropped Python 3.9, leaving 3.8/3.9 unbuildable from source - by
+  :user:`gaborbernat`. (:issue:`92`)
+
+********************
+ v1.4.2 (2026-06-11)
+********************
+
+Bug fixes - 1.4.2
+=================
+- Stop executable symlink resolution once the stdlib landmark is reachable and keep macOS framework builds untouched,
+  matching ``getpath`` - Homebrew interpreters no longer get version-pinned ``Cellar`` paths recorded and stable
+  aliases such as Debian's ``/usr/bin/python3`` are preserved - by :user:`gaborbernat`. (:issue:`86`)
+
 ********************
  v1.4.1 (2026-06-11)
 ********************

{python_discovery-1.4.1 → python_discovery-1.4.3}/pyproject.toml

@@ -2,7 +2,8 @@
 build-backend = "hatchling.build"
 requires = [
   "hatch-vcs>=0.5",
-  "hatchling>=1.28",
+  "hatchling>=1.27; python_version<'3.10'",
+  "hatchling>=1.28; python_version>='3.10'",
 ]
 
 [project]

{python_discovery-1.4.1 → python_discovery-1.4.3}/src/python_discovery/_py_info.py

@@ -225,21 +225,28 @@ class PythonInfo:  # noqa: PLR0904
         # Try fallback for POSIX virtual environments
         return self._try_posix_fallback_executable(base_executable)  # pragma: >=3.11 cover
 
-    def _resolve_executable_symlink(self, path: str) -> str:
+    def _resolve_executable_symlink(self, path: str, *, framework: bool | None = None) -> str:
         """
         Resolve symlinks of the executable itself, but never of its parent directories.
 
         Mirrors CPython's ``getpath.realpath`` (and ``venv`` in python/cpython#115237): an executable-only symlink
         resolves to the real interpreter so its home can be located, while a fully symlinked interpreter tree is
-        kept as-is.
+        kept as-is. Like ``getpath``, resolution stops as soon as the stdlib landmark is reachable from the current
+        directory - an alias such as Debian's ``/usr/bin/python3`` is a usable home and stays untouched.
         """
         result = os.path.abspath(path)
         if self.os != "posix":  # CPython only does this where HAVE_READLINK
             return result
+        if framework is None:
+            framework = bool(sysconfig.get_config_var("PYTHONFRAMEWORK"))
+        if framework:  # macOS framework builds self-locate via dyld from the real binary; e.g. for Homebrew
+            return result  # resolving would pin the versioned Cellar path into the recorded home
         real_path = os.path.realpath(result)
         if not os.path.exists(real_path):  # symlink loop or broken symlink
             return result
         while os.path.islink(result):
+            if self._stdlib_landmark_exists(os.path.dirname(result)):
+                return result
             link = os.readlink(result)
             candidate = link if os.path.isabs(link) else os.path.normpath(os.path.join(os.path.dirname(result), link))
             # normpath through a symlinked directory may point at a different file - stop resolving there
@@ -248,6 +255,13 @@ class PythonInfo:  # noqa: PLR0904
             result = candidate
         return result
 
+    @staticmethod
+    def _stdlib_landmark_exists(dir_path: str) -> bool:
+        lib_name = os.path.basename(os.path.dirname(os.__file__))
+        return any(
+            os.path.exists(os.path.join(dir_path, os.pardir, lib, lib_name, "os.py")) for lib in ("lib", "lib64")
+        )
+
     def _try_posix_fallback_executable(self, base_executable: str) -> str | None:
         """Find a versioned Python binary as fallback for POSIX virtual environments."""
         major, minor = self.version_info.major, self.version_info.minor
@@ -415,7 +429,7 @@ class PythonInfo:  # noqa: PLR0904
 
     @property
     def machine(self) -> str:
-        """Return the instruction set architecture (ISA) derived from :func:`sysconfig.get_platform`."""
+        """The instruction set architecture (ISA) derived from :func:`sysconfig.get_platform`."""
         plat = self.sysconfig_platform
         if plat is None:
             return "unknown"

{python_discovery-1.4.1 → python_discovery-1.4.3}/tests/test_py_info_extra.py

@@ -183,11 +183,36 @@ def test_resolve_executable_symlink(
     layout: Callable[[Path], tuple[Path, Path]],
 ) -> None:
     path, expected = layout(tmp_path)
-    assert posix_info._resolve_executable_symlink(str(path)) == str(expected)
+    assert posix_info._resolve_executable_symlink(str(path), framework=False) == str(expected)
 
 
 @pytest.mark.skipif(sys.platform == "win32", reason="POSIX only")
-def test_from_exe_resolves_executable_only_symlink(tmp_path: Path, session_cache: DiskCache) -> None:
+def test_resolve_executable_symlink_framework_kept(tmp_path: Path, posix_info: PythonInfo) -> None:
+    link, _exe = _layout_absolute_symlink(tmp_path)
+    assert posix_info._resolve_executable_symlink(str(link), framework=True) == str(link)
+
+
+@pytest.mark.skipif(sys.platform == "win32", reason="POSIX only")
+def test_resolve_executable_symlink_stdlib_landmark_kept(tmp_path: Path, posix_info: PythonInfo) -> None:
+    exe = tmp_path / "install" / "bin" / "python3.12"
+    exe.parent.mkdir(parents=True)
+    exe.touch()
+    alias_bin = tmp_path / "alias" / "bin"
+    alias_bin.mkdir(parents=True)
+    landmark = tmp_path / "alias" / "lib" / Path(os.__file__).parent.name / "os.py"
+    landmark.parent.mkdir(parents=True)
+    landmark.touch()
+    link = alias_bin / "python3"
+    link.symlink_to(exe)
+    assert posix_info._resolve_executable_symlink(str(link), framework=False) == str(link)
+
+
+@pytest.mark.skipif(sys.platform == "win32", reason="POSIX only")
+@pytest.mark.skipif(bool(CURRENT.sysconfig_vars.get("PYTHONFRAMEWORK")), reason="framework builds keep recorded path")
+def test_from_exe_resolves_executable_only_symlink(  # pragma: no cover # skipped on framework interpreter hosts
+    tmp_path: Path,
+    session_cache: DiskCache,
+) -> None:
     system_exe = CURRENT.system_executable
     assert system_exe is not None
     link = tmp_path / "python3"
@@ -196,7 +221,7 @@ def test_from_exe_resolves_executable_only_symlink(tmp_path: Path, session_cache
     assert info is not None
     assert info.system_executable is not None
     assert Path(info.system_executable).samefile(system_exe)
-    assert not Path(info.system_executable).is_symlink()
+    assert Path(info.system_executable).parent != tmp_path
 
 
 def test_try_posix_fallback_not_posix() -> None: