pex 2.103.2__tar.gz → 2.103.4__tar.gz

{pex-2.103.2 → pex-2.103.4}/CHANGES.md

@@ -1,5 +1,19 @@
 # Release Notes
 
+## 2.103.4
+
+This release upgrades the minimum `pexrc` verison to 0.32.1 when using `pex --rc`. This brings
+improved improved `--sh-boot` handling along the lines of the improvement in Pex in 2.103.3.
+
+* Upgrade `pexrc` to 0.32.1.
+
+## 2.103.3
+
+This release fixes `--sh-boot` mode to respect `PEX_PYTHON` and `PEX_PYTHON_PATH`. Previously, only
+`PATH` was consulted in the search for Python interpreters in the `/bin/sh` boot code.
+
+* Fix `--sh-boot` to respect `PEX_PYTHON{,_PATH}`. (#3291)
+
 ## 2.103.2
 
 This release fixes `pex3 venv create --link-python` for a foreign platform when the venv is

{pex-2.103.2 → pex-2.103.4}/PKG-INFO

@@ -1,15 +1,15 @@
 Metadata-Version: 2.4
 Name: pex
-Version: 2.103.2
+Version: 2.103.4
 Summary: The PEX packaging toolchain.
 Home-page: https://github.com/pex-tool/pex
-Download-URL: https://github.com/pex-tool/pex/releases/download/v2.103.2/pex
+Download-URL: https://github.com/pex-tool/pex/releases/download/v2.103.4/pex
 Author: The PEX developers
 Author-email: developers@pex-tool.org
 License-Expression: Apache-2.0
-Project-URL: Changelog, https://github.com/pex-tool/pex/blob/v2.103.2/CHANGES.md
+Project-URL: Changelog, https://github.com/pex-tool/pex/blob/v2.103.4/CHANGES.md
 Project-URL: Documentation, https://docs.pex-tool.org/
-Project-URL: Source, https://github.com/pex-tool/pex/tree/v2.103.2
+Project-URL: Source, https://github.com/pex-tool/pex/tree/v2.103.4
 Keywords: package,executable,virtualenv,lock,freeze
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers

{pex-2.103.2 → pex-2.103.4}/docker/base/Dockerfile

@@ -1,5 +1,5 @@
 # An image with the necessary binaries and libraries to develop pex.
-ARG UBUNTU_VERSION=24.04
+ARG UBUNTU_VERSION=26.04
 FROM ubuntu:${UBUNTU_VERSION}
 
 # We use pyenv to bootstrap interpreters and pyenv needs most of these packages.

pex-2.103.4/docker/base/new-versions.toml

@@ -0,0 +1,24 @@
+# N.B.: 2.7, 3.9 and 3.11 are needed in both version sets to run certain dev-cmd commands.
+
+default-version = "python3.14"
+versions = [
+    # N.B.: Old, but needed for some dev-cmd commands.
+    { source = "pyenv", version = "2.7.18" },
+    { source = "dead-snakes", version = "3.9.25", packages = ["dev", "venv", "distutils"] },
+
+    # New:
+    { source = "dead-snakes", version = "3.10.22", packages = ["dev", "venv", "distutils"] },
+    { source = "dead-snakes", version = "3.11.17", packages = ["dev", "venv", "distutils"] },
+    { source = "dead-snakes", version = "3.12.15", packages = ["dev", "venv"] },
+    { source = "dead-snakes", version = "3.13.16", packages = ["dev", "venv"] },
+    { source = "pyenv", version = "3.14.8" },
+    { source = "dead-snakes", version = "3.15.0~rc2", packages = ["dev", "venv"] },
+    { source = "pyenv", version = "pypy3.10-7.3.19" },
+    { source = "pyenv", version = "pypy3.11-8.0.0" },
+    { source = "pyenv", version = "pypy3.12-8.0.0" },
+]
+
+# N.B.: These versions are installed on Ubuntu 26.04 which ships its own (older) CPython 3.14.
+uninstall-packages = [
+    "python3.14"
+]

{pex-2.103.2 → pex-2.103.4}/docker/base/old-versions.toml

@@ -15,7 +15,7 @@ versions = [
     { source = "pyenv", version = "3.7.17" },
     { source = "pyenv", version = "3.8.20" },
     { source = "pyenv", version = "3.9.25" },
-    { source = "pyenv", version = "pypy2.7-7.3.22" },
+    { source = "pyenv", version = "pypy2.7-8.0.0" },
     # This is served from:
     #   https://bitbucket-archive.softwareheritage.org/static/14/140b7b14-aa94-424e-b191-9cd3438381f7/attachments/pypy3.5-7.0.0-linux_x86_64-portable.tar.bz2
     # which has begun to prove flaky; so we comment out for now and perhaps need to drop or

{pex-2.103.2 → pex-2.103.4}/duvrc.sh

@@ -11,7 +11,7 @@ else
 fi
 
 if [[ "${BASE_PYTHONS}" == "new" ]]; then
-  UBUNTU_VERSION=24.04
+  UBUNTU_VERSION=26.04
 else
   UBUNTU_VERSION=20.04
 fi

{pex-2.103.2 → pex-2.103.4}/pex/interpreter_constraints.py

@@ -393,11 +393,11 @@ COMPATIBLE_PYTHON_VERSIONS = (
     PythonVersion(Lifecycle.EOL, 3, 7, 17),
     PythonVersion(Lifecycle.EOL, 3, 8, 20),
     PythonVersion(Lifecycle.EOL, 3, 9, 25),
-    PythonVersion(Lifecycle.STABLE, 3, 10, 21),
-    PythonVersion(Lifecycle.STABLE, 3, 11, 16),
-    PythonVersion(Lifecycle.STABLE, 3, 12, 14),
-    PythonVersion(Lifecycle.STABLE, 3, 13, 15),
-    PythonVersion(Lifecycle.STABLE, 3, 14, 7),
+    PythonVersion(Lifecycle.STABLE, 3, 10, 22),
+    PythonVersion(Lifecycle.STABLE, 3, 11, 17),
+    PythonVersion(Lifecycle.STABLE, 3, 12, 15),
+    PythonVersion(Lifecycle.STABLE, 3, 13, 16),
+    PythonVersion(Lifecycle.STABLE, 3, 14, 8),
     PythonVersion(Lifecycle.DEV, 3, 15, 0),
 )
 

{pex-2.103.2 → pex-2.103.4}/pex/rc/pexrc.py

@@ -38,7 +38,7 @@ else:
 
 
 PEXRC_RELEASES_URL = "https://github.com/pex-tool/pex.rc/releases"
-MIN_PEXRC_VERSION = Version("0.20.0")
+MIN_PEXRC_VERSION = Version("0.32.1")
 PEXRC_REQUIREMENT = SpecifierSet("~={min_version}".format(min_version=MIN_PEXRC_VERSION))
 
 

{pex-2.103.2 → pex-2.103.4}/pex/sh_boot.py

@@ -260,16 +260,39 @@ def create_sh_boot_script(
         fi
 
         find_python() {{
+            if [ -f "${{PEX_PYTHON:-}}" -a -x "${{PEX_PYTHON:-}}" ]; then
+                echo "${{PEX_PYTHON}}"
+                return
+            fi
+            _path="${{PATH:-}}"
+            _ifs=$IFS
+            IFS=:
+            for entry in ${{PEX_PYTHON_PATH:-}}; do
+                if [ -z "${{entry}}" ]; then
+                    entry="."
+                fi
+                if [ -f "${{entry}}" -a -x "${{entry}}" ]; then
+                    echo "${{entry}}"
+                    return
+                elif [ -d "${{entry}}" ]; then
+                    if [ -n "${{_path}}" ]; then
+                        _path="${{entry}}:${{_path}}"
+                    else
+                        _path="${{entry}}"
+                    fi
+                fi
+            done
+            IFS=$_ifs
             for python in \\
         {pythons} \\
             ; do
-                if command -v "${{python}}" 2>/dev/null; then
+                if PATH="${{_path}}" command -v "${{python}}" 2>/dev/null; then
                     return
                 fi
             done
         }}
 
-        if [ -x "${{DEFAULT_PYTHON}}" ]; then
+        if [ -f "${{DEFAULT_PYTHON}}" -a -x "${{DEFAULT_PYTHON}}" ]; then
             python_exe="${{DEFAULT_PYTHON}}"
         else
             python_exe="$(find_python)"

{pex-2.103.2 → pex-2.103.4}/pex/version.py

@@ -1,4 +1,4 @@
 # Copyright 2015 Pex project contributors.
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-__version__ = "2.103.2"
+__version__ = "2.103.4"

{pex-2.103.2 → pex-2.103.4}/testing/__init__.py

@@ -36,7 +36,7 @@ from pex.sysconfig import SCRIPT_DIR, script_name
 from pex.targets import LocalInterpreter
 from pex.typing import TYPE_CHECKING, cast
 from pex.util import CacheHelper, named_temporary_file
-from pex.venv.virtualenv import InstallationChoice, Virtualenv
+from pex.venv.virtualenv import InstallationChoice, InvalidVirtualenvError, Virtualenv
 
 # Explicitly re-export subprocess to enable a transparent substitution in tests that supports
 # executing PEX files directly on Windows.
@@ -1029,8 +1029,11 @@ class NonDeterministicWalk:
         return x[-rotate_by:] + x[:-rotate_by]
 
 
-def installed_pex_wheel_venv_python(python):
-    # type: (str) -> str
+def installed_pex_wheel_venv_python(
+    python,  # type: str
+    reinstall=True,  # type: bool
+):
+    # type: (...) -> str
 
     from testing.pex_dist import wheel
 
@@ -1048,4 +1051,17 @@ def installed_pex_wheel_venv_python(python):
             ):
                 # Just ensure the re-writing iterator is driven to completion.
                 pass
-    return Virtualenv(pex_venv_dir).interpreter.binary
+
+    if not reinstall:
+        return Virtualenv(pex_venv_dir).interpreter.binary
+
+    # N.B.: This handles dangling symlinks when we upgrade our base image interpreters.
+    unlock = atomic_dir.lock()
+    try:
+        venv_python = Virtualenv(pex_venv_dir).interpreter.binary
+        unlock()
+        return venv_python
+    except InvalidVirtualenvError:
+        safe_rmtree(pex_venv_dir)
+        unlock()
+        return installed_pex_wheel_venv_python(python, reinstall=False)

{pex-2.103.2 → pex-2.103.4}/tests/integration/test_issue_2038.py

@@ -12,17 +12,18 @@ import pytest
 
 from pex.common import touch
 from pex.typing import TYPE_CHECKING
-from testing import run_pex_command, subprocess
+from testing import IS_PYPY, run_pex_command, subprocess
 
 if TYPE_CHECKING:
     from typing import Any
 
 
 @pytest.mark.skipif(
-    sys.version_info[:2] < (3, 7) or sys.version_info >= (3, 13),
+    sys.version_info[:2] < (3, 7) or sys.version_info >= (3, 13) or IS_PYPY,
     reason=(
         "This test needs to run Poetry which requires at least Python 3.7. Poetry also indirectly "
-        "depends on rpds-py (0.18.1 currently), which uses PyO3 which requires Python<3.13."
+        "depends on rpds-py (0.18.1 currently), which uses PyO3 which requires Python<3.13. The "
+        "PyO3 dep builds under PyPy and that is too slow; so we also skip PyPy."
     ),
 )
 def test_wheel_file_url_dep(tmpdir):

pex-2.103.4/tests/integration/test_issue_3289.py

@@ -0,0 +1,90 @@
+# Copyright 2026 Pex project contributors.
+# Licensed under the Apache License, Version 2.0 (see LICENSE).
+
+from __future__ import absolute_import
+
+import os
+import subprocess
+
+import pytest
+
+from pex.interpreter import PythonInterpreter
+from testing import IS_WINDOWS, make_env, run_pex_command
+from testing.pytest_utils.tmp import Tempdir
+
+skip_if_windows = pytest.mark.skipif(
+    IS_WINDOWS, reason="The `--sh-boot` option under test is only for unix targets."
+)
+
+
+@pytest.fixture
+def pex(tmpdir):
+    # type: (Tempdir) -> str
+
+    pex = tmpdir.join("pex")
+    pex_root = tmpdir.join("pex-root")
+    run_pex_command(
+        args=[
+            "--runtime-pex-root",
+            pex_root,
+            "--sh-boot",
+            "--python-shebang",
+            "/nonexistent/python",
+            "-o",
+            pex,
+        ]
+    ).assert_success()
+    return pex
+
+
+@skip_if_windows
+def test_sh_boot_respects_pex_python(
+    tmpdir,  # type: Tempdir
+    pex,  # type: str
+    py311,  # type: PythonInterpreter
+):
+    # type: (...) -> None
+
+    assert (
+        py311.binary
+        == subprocess.check_output(
+            args=[pex, "-c", "import sys; print(sys.executable)"],
+            env=make_env(PATH="/nonexistent", PEX_PYTHON=py311.binary),
+        )
+        .decode("utf-8")
+        .strip()
+    )
+
+
+@skip_if_windows
+def test_sh_boot_respects_pex_python_path(
+    tmpdir,  # type: Tempdir
+    pex,  # type: str
+    py311,  # type: PythonInterpreter
+):
+    # type: (...) -> None
+
+    assert (
+        py311.binary
+        == subprocess.check_output(
+            args=[pex, "-c", "import sys; print(sys.executable)"],
+            env=make_env(
+                PATH="/nonexistent", PEX_PYTHON_PATH=":".join(("/also/dne", py311.binary))
+            ),
+        )
+        .decode("utf-8")
+        .strip()
+    )
+
+    assert (
+        py311.binary
+        == subprocess.check_output(
+            args=[pex, "-c", "import sys; print(sys.executable)"],
+            env=make_env(
+                PATH="/nonexistent",
+                PEX_PYTHON_PATH=":".join(("/also/dne", os.path.dirname(py311.binary))),
+            ),
+        )
+        .decode("utf-8")
+        .strip()
+    )

{pex-2.103.2 → pex-2.103.4}/tests/integration/test_keyring_support.py

@@ -23,7 +23,7 @@ from pex.resolve.configured_resolver import ConfiguredResolver
 from pex.resolve.package_repository import PYPI
 from pex.typing import TYPE_CHECKING
 from pex.venv.virtualenv import InstallationChoice, Virtualenv
-from testing import PY_VER, WheelBuilder, make_env, run_pex_command
+from testing import IS_PYPY, PY_VER, WheelBuilder, make_env, run_pex_command
 from testing.mitmproxy import Proxy
 
 if TYPE_CHECKING:
@@ -182,7 +182,12 @@ def devpi_clean_env():
 
 
 skip_if_required_keyring_version_not_supported = pytest.mark.skipif(
-    PY_VER < (3, 8), reason="The keyring distribution used for this test requires Python `>=3.8`."
+    PY_VER < (3, 8) or IS_PYPY,
+    reason=(
+        "The keyring distribution used for this test requires Python `>=3.8`. Additionally some "
+        "transitive dependencies (cryptography et. al.) are only available in sdist form for the "
+        "versions of PyPy (>=8.0.0) we test against, and those are very slow to build."
+    ),
 )
 
 keyring_provider_pip_versions = pytest.mark.parametrize(

pex-2.103.2/docker/base/new-versions.toml

@@ -1,23 +0,0 @@
-# N.B.: 2.7, 3.9 and 3.11 are needed in both version sets to run certain dev-cmd commands.
-
-default-version = "python3.14"
-versions = [
-    # N.B.: Old, but needed for some dev-cmd commands.
-    { source = "pyenv", version = "2.7.18" },
-    { source = "dead-snakes", version = "3.9.25", packages = ["dev", "venv", "distutils"] },
-
-    # New:
-    { source = "pyenv", version = "3.10.21" },
-    { source = "pyenv", version = "3.11.16" },
-    { source = "pyenv", version = "3.12.14" },
-    { source = "dead-snakes", version = "3.13.15", packages = ["dev", "venv"] },
-    { source = "pyenv", version = "3.14.7" },
-    { source = "dead-snakes", version = "3.15.0~rc2", packages = ["dev", "venv"] },
-    { source = "pyenv", version = "pypy3.10-7.3.19" },
-    { source = "pyenv", version = "pypy3.11-7.3.22" },
-]
-
-# N.B.: These versions are installed on Ubuntu 24.04 which ships its own (older) CPython 3.12.
-uninstall-packages = [
-    "python3.12"
-]