pex 2.95.2__tar.gz → 2.96.0__tar.gz

{pex-2.95.2 → pex-2.96.0}/CHANGES.md

@@ -1,5 +1,21 @@
 # Release Notes
 
+## 2.96.0
+
+This release adds support for `--pip-version 26.1.2`.
+
+* Add support for `--pip-version 26.1.2`. (#3182)
+
+## 2.95.3
+
+This release has `--venv` PEXes using PEP-829 `.start` files to affect `PEX_EXTRA_SYS_PATH`
+`sys.path` mutation instead of `.pth` import lines. Although the `.pth` file is still emitted for
+maximum compatibility with third party code, the `PEX_EXTRA_SYS_PATH.pth` file will no longer be
+emitted for PEX venvs using Python 3.20 and greater. See [PEP-829](https://peps.python.org/pep-0829)
+and the [3.15 notes](https://docs.python.org/3.15/whatsnew/3.15.html#whatsnew315-startup-files).
+
+* Use `PEX_EXTRA_SYS_PATH.start` for Python 3.15 venvs.
+
 ## 2.95.2
 
 This release upgrades the minimum version required of the `pexrc` tool to 0.12.5 to satisfy `--rc`

{pex-2.95.2 → pex-2.96.0}/PKG-INFO

@@ -1,15 +1,15 @@
 Metadata-Version: 2.4
 Name: pex
-Version: 2.95.2
+Version: 2.96.0
 Summary: The PEX packaging toolchain.
 Home-page: https://github.com/pex-tool/pex
-Download-URL: https://github.com/pex-tool/pex/releases/download/v2.95.2/pex
+Download-URL: https://github.com/pex-tool/pex/releases/download/v2.96.0/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.95.2/CHANGES.md
+Project-URL: Changelog, https://github.com/pex-tool/pex/blob/v2.96.0/CHANGES.md
 Project-URL: Documentation, https://docs.pex-tool.org/
-Project-URL: Source, https://github.com/pex-tool/pex/tree/v2.95.2
+Project-URL: Source, https://github.com/pex-tool/pex/tree/v2.96.0
 Keywords: package,executable,virtualenv,lock,freeze
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers

{pex-2.95.2 → pex-2.96.0}/pex/pip/version.py

@@ -494,6 +494,13 @@ class PipVersion(Enum["PipVersionValue"]):
         requires_python=">=3.10,<3.16",
     )
 
+    v26_1_2 = PipVersionValue(
+        version="26.1.2",
+        setuptools_version="82.0.1",
+        wheel_version="0.47.0",
+        requires_python=">=3.10,<3.16",
+    )
+
     ADHOC = Adhoc()
 
     VENDORED = v20_3_4_patched

{pex-2.95.2 → pex-2.96.0}/pex/venv/installer.py

@@ -620,14 +620,49 @@ def install_pex_main(
 ):
     # type: (...) -> None
 
-    with open(os.path.join(venv.site_packages_dir, "PEX_EXTRA_SYS_PATH.pth"), "w") as fp:
-        # N.B.: .pth import lines must be single lines: https://docs.python.org/3/library/site.html
-        for env_var in "PEX_EXTRA_SYS_PATH", "__PEX_EXTRA_SYS_PATH__":
+    with open(os.path.join(venv.site_packages_dir, "PEX_EXTRA_SYS_PATH.py"), "w") as fp:
+        # See: https://peps.python.org/pep-0829/
+        fp.write(
+            dedent(
+                """\
+                import os
+                import sys
+
+
+                def _extend_sys_path(path_env_var):
+                    path = os.environ.get(path_env_var)
+                    if path:
+                        entries = path.split(os.pathsep)
+                        sys.path.extend(entries)
+                        return entries
+                    return []
+
+
+                def extend_sys_path(legacy=False):
+                    entries = _extend_sys_path("PEX_EXTRA_SYS_PATH")
+                    entries.extend(_extend_sys_path("__PEX_EXTRA_SYS_PATH__"))
+                    debug = os.environ.pop("__PEX_EXTRA_SYS_PATH_DEBUG__", "")
+                    if debug:
+                        import json
+                        with open(debug, "w") as fp:
+                            json.dump({"entries": entries, "legacy": legacy}, fp)
+                """
+            )
+        )
+
+    # Starting with Python 3.15 .start files trump import lines in .pth files.
+    # See: https://peps.python.org/pep-0829/#abstract
+    if venv.interpreter.version >= (3, 15):
+        with open(os.path.join(venv.site_packages_dir, "PEX_EXTRA_SYS_PATH.start"), "w") as fp:
+            print("PEX_EXTRA_SYS_PATH:extend_sys_path", file=fp)
+
+    # After ~Python 3.20 .pth import lines will start to raise warnings; so we no longer emit a .pth
+    # compatibility bridge. See: https://peps.python.org/pep-0829/#abstract
+    if venv.interpreter.version < (3, 20):
+        with open(os.path.join(venv.site_packages_dir, "PEX_EXTRA_SYS_PATH.pth"), "w") as fp:
+            # N.B.: .pth import lines must be single lines: https://docs.python.org/3/library/site.html
             print(
-                "import os, sys; "
-                "sys.path.extend("
-                "entry for entry in os.environ.get('{env_var}', '').split({pathsep!r}) if entry"
-                ")".format(env_var=env_var, pathsep=os.pathsep),
+                "import PEX_EXTRA_SYS_PATH; PEX_EXTRA_SYS_PATH.extend_sys_path(legacy=True)",
                 file=fp,
             )
 

{pex-2.95.2 → pex-2.96.0}/pex/venv/venv_pex.py

@@ -172,8 +172,8 @@ def boot(
         if name.startswith(("PEX_", "_PEX_", "__PEX_"))
         and name
         not in (
-            # These are used inside this script / the PEX_EXTRA_SYS_PATH.pth site-packages
-            # file.
+            # These are used inside this script / the PEX_EXTRA_SYS_PATH.{pth,py,start}
+            # site-packages files.
             "_PEX_SHOULD_EXIT_VENV_REEXEC",
             "PEX_EXTRA_SYS_PATH",
             "PEX_VENV_BIN_PATH",

{pex-2.95.2 → pex-2.96.0}/pex/version.py

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

{pex-2.95.2 → pex-2.96.0}/testing/venv.py

@@ -27,7 +27,9 @@ def assert_venv_site_packages_copy_mode(
         # checking those. In addition, we generate .pex-info metadata ourselves.
         dirs[:] = [d for d in dirs if not d.endswith((".dist-info", ".pex-info"))]
         for f in files:
-            if f == "PEX_EXTRA_SYS_PATH.pth":
+            if f in ("PEX_EXTRA_SYS_PATH.pth", "PEX_EXTRA_SYS_PATH.py", "PEX_EXTRA_SYS_PATH.start"):
+                continue
+            if f.startswith("PEX_EXTRA_SYS_PATH.") and f.endswith(".pyc"):
                 continue
             file_path = os.path.join(root, f)
             if expected_copy_mode is CopyMode.SYMLINK:

{pex-2.95.2 → pex-2.96.0}/tests/integration/cli/commands/test_venv_create.py

@@ -409,12 +409,15 @@ def test_pex_scope_venv(
 
     shutil.rmtree(dest)
     install_srcs()
-    assert_srcs_only(
-        venv.site_packages_dir,
-        # Any venv created from a PEX supports the PEX_EXTRA_SYS_PATH runtime env var via this
-        # `.pth` file.
-        "PEX_EXTRA_SYS_PATH.pth",
-    )
+
+    # Any venv created from a PEX supports the PEX_EXTRA_SYS_PATH runtime env var via these files.
+    extra_srcs = ["PEX_EXTRA_SYS_PATH.py"]
+    if venv.interpreter.version >= (3, 15):
+        extra_srcs.append("PEX_EXTRA_SYS_PATH.start")
+    if venv.interpreter.version < (3, 20):
+        extra_srcs.append("PEX_EXTRA_SYS_PATH.pth")
+
+    assert_srcs_only(venv.site_packages_dir, *extra_srcs)
 
 
 def test_pex_scope_flat(

pex-2.96.0/tests/integration/venv_ITs/test_pep_829.py

@@ -0,0 +1,48 @@
+# Copyright 2026 Pex project contributors.
+# Licensed under the Apache License, Version 2.0 (see LICENSE).
+
+from __future__ import absolute_import
+
+import json
+import os
+import sys
+
+from testing import make_env, run_pex_command
+from testing.pytest_utils.tmp import Tempdir
+
+
+def test_pex_extra_sys_path(tmpdir):
+    # type: (Tempdir) -> None
+
+    pex_root = tmpdir.join("pex-root")
+    debug_file = tmpdir.join("debug.json")
+    one = tmpdir.join("entry-one")
+    two = tmpdir.join("entry-two")
+    three = tmpdir.join("entry-three")
+    result = run_pex_command(
+        args=[
+            "--pex-root",
+            pex_root,
+            "--runtime-pex-root",
+            pex_root,
+            "--venv",
+            "--",
+            "-c",
+            "import json, sys; json.dump(sys.path, sys.stdout)",
+        ],
+        env=make_env(
+            PEX_EXTRA_SYS_PATH=os.pathsep.join([two, one]),
+            __PEX_EXTRA_SYS_PATH__=three,
+            __PEX_EXTRA_SYS_PATH_DEBUG__=debug_file,
+        ),
+    )
+    result.assert_success()
+
+    observed_sys_path = json.loads(result.output)
+    assert [two, one, three] == observed_sys_path[-3:]
+
+    with open(debug_file) as fp:
+        data = json.load(fp)
+
+    assert data["legacy"] == (sys.version_info[:2] < (3, 15))
+    assert [two, one, three] == data["entries"]