pex 2.59.3__tar.gz → 2.59.5__tar.gz

{pex-2.59.3 → pex-2.59.5}/CHANGES.md

@@ -1,5 +1,24 @@
 # Release Notes
 
+## 2.59.5
+
+This release optimizes `--venv-repository` installed wheel caching to only store one copy per
+unique wheel even when that wheel is resolved from multiple `--venv-repository`s.
+
+This release also updates vendored Pip's vendored certifi's cacert.pem to that from certifi
+2025.10.5.
+
+* Do not hash installed scripts from `--venv-repository`. (#2395)
+* Update vendored Pip's CA cert bundle. (#2934)
+
+## 2.59.4
+
+This release fixes a bug in `--venv-repository` resolution that would lead to resolution failure
+when the same wheel (that has console script entry points) is installed in multiple venvs and those
+venvs are used as `--venv-repository` resolve sources.
+
+* Fix `--venv-repository` wheel cache copy-pasta bug. (#2932)
+
 ## 2.59.3
 
 This release fixes `--venv-repository` to work with venvs that have installed wheels with

{pex-2.59.3 → pex-2.59.5}/PKG-INFO

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

{pex-2.59.3 → pex-2.59.5}/docker/base/install_pythons.sh

@@ -11,8 +11,8 @@ DEADSNAKES_VERSIONS=(
   "3.8 {dev,venv,distutils}=3.8.20"
   "3.9 {dev,venv,distutils}=3.9.23"
   "3.10 {dev,venv,distutils}=3.10.18"
-  "3.13 {dev,venv}=3.13.7"
-  "3.14 {dev,venv}=3.14.0~rc3"
+  "3.13 {dev,venv}=3.13.8"
+  "3.14 {dev,venv}=3.14.0"
 )
 
 add-apt-repository --yes --ppa deadsnakes

{pex-2.59.3 → pex-2.59.5}/pex/build_backend/wrap.py

@@ -22,10 +22,11 @@ from pex.common import (
     open_zip,
     safe_mkdtemp,
 )
+from pex.compatibility import PY2
 from pex.typing import TYPE_CHECKING, cast
 
 if TYPE_CHECKING:
-    from typing import Any, Dict, Iterator, Optional
+    from typing import Any, Callable, Dict, Iterator, Optional, Sequence, Tuple
 
 
 _CONFIG = load_config(internal_plugins=[(ScriptLocks.CONFIG_KEY, ScriptLocks)])
@@ -96,6 +97,27 @@ def build_sdist(
     return sdist_name
 
 
+if TYPE_CHECKING:
+    from typing import Protocol
+
+    class CSVWriter(Protocol):
+        def writerow(self, row):
+            # type: (Sequence[Any]) -> None
+            pass
+
+
+def csv_output():
+    # type: () -> Tuple[CSVWriter, Callable[[], bytes]]
+    if PY2:
+        record = io.BytesIO()
+        csv_writer = csv.writer(record, delimiter=",", quotechar='"', lineterminator="\n")
+        return csv_writer, record.getvalue
+    else:
+        record = io.StringIO()
+        csv_writer = csv.writer(record, delimiter=",", quotechar='"', lineterminator="\n")
+        return csv_writer, lambda: record.getvalue().encode("utf-8")
+
+
 def build_wheel(
     wheel_directory,  # type: str
     config_settings=None,  # type: Optional[Dict[str, Any]]
@@ -142,8 +164,7 @@ def build_wheel(
     record_zinfo, _ = ZipFileEx.zip_info_from_file(
         os.path.join(build_dir, record_relpath), arcname=record_relpath, date_time=date_time
     )
-    record = io.StringIO()
-    csv_writer = csv.writer(record, delimiter=",", quotechar='"', lineterminator="\n")
+    csv_writer, get_csv_bytes = csv_output()
     with open_zip(wheel_path, "w") as zf:
         for path in _iter_files_deterministic(build_dir):
             if path == record_relpath:
@@ -162,6 +183,6 @@ def build_wheel(
             )
 
         csv_writer.writerow((record_relpath, None, None))
-        zf.writestr(record_zinfo, record.getvalue().encode("utf-8"))
+        zf.writestr(record_zinfo, get_csv_bytes())
 
     return wheel_name

{pex-2.59.3 → pex-2.59.5}/pex/compatibility.py

@@ -62,7 +62,7 @@ if PY2:
         # type: (AnyStr, Text) -> bytes
         if isinstance(st, unicode):
             return st.encode(encoding)
-        elif isinstance(st, bytes):
+        elif isinstance(st, (str, bytes)):
             return st
         else:
             raise ValueError("Cannot convert %s to bytes" % type(st))

{pex-2.59.3 → pex-2.59.5}/pex/interpreter_constraints.py

@@ -379,8 +379,9 @@ COMPATIBLE_PYTHON_VERSIONS = (
     PythonVersion(Lifecycle.STABLE, 3, 10, 18),
     PythonVersion(Lifecycle.STABLE, 3, 11, 13),
     PythonVersion(Lifecycle.STABLE, 3, 12, 11),
-    PythonVersion(Lifecycle.STABLE, 3, 13, 7),
-    PythonVersion(Lifecycle.DEV, 3, 14, 0),
+    PythonVersion(Lifecycle.STABLE, 3, 13, 8),
+    PythonVersion(Lifecycle.STABLE, 3, 14, 0),
+    PythonVersion(Lifecycle.DEV, 3, 15, 0),
 )
 
 

{pex-2.59.3 → pex-2.59.5}/pex/pep_376.py

@@ -22,6 +22,7 @@ from pex.common import (
     safe_open,
     safe_relative_symlink,
 )
+from pex.compatibility import PY2
 from pex.fs import safe_link
 from pex.interpreter import PythonInterpreter
 from pex.typing import TYPE_CHECKING, cast
@@ -30,7 +31,7 @@ from pex.venv.virtualenv import Virtualenv
 from pex.wheel import WHEEL, Wheel, WheelMetadataLoadError
 
 if TYPE_CHECKING:
-    from typing import Callable, Iterable, Iterator, Optional, Protocol, Text, Tuple, Union
+    from typing import IO, Callable, Iterable, Iterator, Optional, Protocol, Text, Tuple, Union
 
     import attr  # vendor:skip
 
@@ -66,7 +67,12 @@ class Hash(object):
         # + https://peps.python.org/pep-0376/#record
         # + https://peps.python.org/pep-0427/#appendix
         fingerprint = base64.urlsafe_b64encode(hasher.digest()).rstrip(b"=")
-        return cls(value="{alg}={hash}".format(alg=hasher.name, hash=fingerprint.decode("ascii")))
+
+        # N.B.: The algorithm is all caps under Python 2.7, but lower case under Python 3; so we
+        # normalize.
+        alg = hasher.name.lower()
+
+        return cls(value="{alg}={hash}".format(alg=alg, hash=fingerprint.decode("ascii")))
 
     value = attr.ib()  # type: str
 
@@ -472,6 +478,17 @@ class Record(object):
     See: https://peps.python.org/pep-0376/#record
     """
 
+    @classmethod
+    def write_fp(
+        cls,
+        fp,  # type: IO
+        installed_files,  # type: Iterable[InstalledFile]
+    ):
+        # type: (...) -> None
+        csv_writer = csv.writer(fp, delimiter=",", quotechar='"', lineterminator="\n")
+        for installed_file in sorted(installed_files, key=lambda installed: installed.path):
+            csv_writer.writerow(attr.astuple(installed_file, recurse=False))
+
     @classmethod
     def write(
         cls,
@@ -482,13 +499,8 @@ class Record(object):
 
         # The RECORD is a csv file with the path to each installed file in the 1st column.
         # See: https://peps.python.org/pep-0376/#record
-        with safe_open(dst, "w") as fp:
-            csv_writer = cast(
-                "CSVWriter",
-                csv.writer(fp, delimiter=",", quotechar='"', lineterminator="\n"),
-            )
-            for installed_file in sorted(installed_files, key=lambda installed: installed.path):
-                csv_writer.writerow(attr.astuple(installed_file, recurse=False))
+        with safe_open(dst, "wb" if PY2 else "w") as fp:
+            cls.write_fp(fp, installed_files)
 
     @classmethod
     def read(

{pex-2.59.3 → pex-2.59.5}/pex/resolve/venv_resolver.py

@@ -5,6 +5,7 @@ from __future__ import absolute_import
 
 import functools
 import hashlib
+import io
 import itertools
 import os
 from collections import defaultdict, deque
@@ -13,6 +14,7 @@ from pex import pex_warnings
 from pex.atomic_directory import atomic_directory
 from pex.cache.dirs import CacheDir, InstalledWheelDir
 from pex.common import safe_relative_symlink
+from pex.compatibility import PY2, commonpath
 from pex.dependency_configuration import DependencyConfiguration
 from pex.dist_metadata import (
     Constraint,
@@ -26,7 +28,7 @@ from pex.exceptions import production_assert, reportable_unexpected_error_msg
 from pex.fingerprinted_distribution import FingerprintedDistribution
 from pex.jobs import DEFAULT_MAX_JOBS, iter_map_parallel
 from pex.orderedset import OrderedSet
-from pex.pep_376 import InstalledWheel
+from pex.pep_376 import InstalledWheel, Record
 from pex.pep_427 import InstallableType, InstallableWheel, InstallPaths, install_wheel_chroot
 from pex.pep_503 import ProjectName
 from pex.pip.version import PipVersion
@@ -36,6 +38,7 @@ from pex.resolve.requirement_configuration import RequirementConfiguration
 from pex.resolve.resolver_configuration import PipConfiguration
 from pex.resolve.resolvers import ResolvedDistribution, Resolver, ResolveResult
 from pex.result import Error
+from pex.sysconfig import script_name
 from pex.targets import LocalInterpreter, Target, Targets
 from pex.typing import TYPE_CHECKING
 from pex.venv.virtualenv import Virtualenv
@@ -49,6 +52,50 @@ else:
     import pex.third_party.attr as attr
 
 
+def _normalize_record(
+    distribution,  # type: Distribution
+    install_paths,  # type: InstallPaths
+    record_data,  # type: bytes
+):
+    # type: (...) -> bytes
+
+    entry_map = distribution.get_entry_map()
+    entry_point_scripts = {
+        script_name(entry_point)
+        for key in ("console_scripts", "gui_scripts")
+        for entry_point in entry_map.get(key, {})
+    }
+    if not entry_point_scripts:
+        return record_data
+
+    scripts_dir = os.path.realpath(install_paths.scripts)
+    installed_files = [
+        installed_file
+        for installed_file in Record.read(lines=iter(record_data.decode("utf-8").splitlines()))
+        if (
+            (os.path.basename(installed_file.path) not in entry_point_scripts)
+            or (
+                scripts_dir
+                != commonpath(
+                    (
+                        scripts_dir,
+                        os.path.realpath(os.path.join(distribution.location, installed_file.path)),
+                    )
+                )
+            )
+        )
+    ]
+
+    if PY2:
+        record_fp = io.BytesIO()
+        Record.write_fp(fp=record_fp, installed_files=installed_files)
+        return record_fp.getvalue()
+    else:
+        record_fp = io.StringIO()
+        Record.write_fp(fp=record_fp, installed_files=installed_files)
+        return record_fp.getvalue().encode("utf-8")
+
+
 def _install_distribution(
     venv_install_paths,  # type: InstallPaths
     distribution,  # type: Distribution
@@ -74,7 +121,14 @@ def _install_distribution(
         )
 
     installed_wheel_dir = InstalledWheelDir.create(
-        wheel_name=wheel.wheel_file_name, install_hash=hashlib.sha256(record_data).hexdigest()
+        wheel_name=wheel.wheel_file_name,
+        install_hash=hashlib.sha256(
+            _normalize_record(
+                distribution=Distribution(location=wheel.location, metadata=wheel.dist_metadata()),
+                install_paths=venv_install_paths,
+                record_data=record_data,
+            )
+        ).hexdigest(),
     )
     with atomic_directory(target_dir=installed_wheel_dir) as atomic_dir:
         if not atomic_dir.is_finalized():
@@ -86,7 +140,7 @@ def _install_distribution(
                 raise AssertionError(reportable_unexpected_error_msg())
             runtime_key_dir = CacheDir.INSTALLED_WHEELS.path(installed_wheel.fingerprint)
             with atomic_directory(runtime_key_dir) as symlink_atomic_dir:
-                if not atomic_dir.is_finalized():
+                if not symlink_atomic_dir.is_finalized():
                     # Note: Create a relative path symlink between the two directories so that the
                     # PEX_ROOT can be used within a chroot environment where the prefix of the path
                     # may change between programs running inside and outside the chroot.

{pex-2.59.3 → pex-2.59.5}/pex/sh_boot.py

@@ -87,7 +87,7 @@ def _calculate_applicable_binary_names(
     # more sophisticated detection and re-direction from these during its own bootstrap. When doing
     # so, select these interpreters from newest to oldest since it more likely any given machine
     # will have Python 3 at this point than it will Python 2.
-    pex_requires_python = SpecifierSet(">=2.7")
+    pex_requires_python = SpecifierSet(os.environ.get("_PEX_REQUIRES_PYTHON", ">=2.7"))
     dist = dist_metadata.find_distribution("pex")  # type: Optional[Distribution]
     if dist and dist.metadata.version == Version(__version__):
         pex_requires_python = dist.metadata.requires_python

{pex-2.59.3 → pex-2.59.5}/pex/vendor/__init__.py

@@ -201,9 +201,11 @@ class VendorSpec(
 #     Automated update of Pip's vendored certifi's cacert.pem to that from certifi 2025.7.14.
 # 12.) https://github.com/pex-tool/pip/commit/21a4058f77f9864151510b725419206a2e5645ae
 #     Automated update of Pip's vendored certifi's cacert.pem to that from certifi 2025.8.3.
+# 13.) https://github.com/pex-tool/pip/commit/cef23bb7153ec49037d963e84fcad0f08880fbc5
+#     Automated update of Pip's vendored certifi's cacert.pem to that from certifi 2025.10.5.
 PIP_SPEC = VendorSpec.git(
     repo="https://github.com/pex-tool/pip",
-    commit="21a4058f77f9864151510b725419206a2e5645ae",
+    commit="cef23bb7153ec49037d963e84fcad0f08880fbc5",
     project_name="pip",
     rewrite=False,
 )

pex-2.59.5/pex/vendor/_vendored/pip/.layout.json

@@ -0,0 +1 @@
+{"fingerprint": "de23a2c694fa2713ad15b0c336b22208fbd1524e975d96886eeb842f2adb1d4e", "record_relpath": "pip-20.3.4.dist-info/RECORD", "root_is_purelib": true, "stash_dir": ".prefix"}

{pex-2.59.3 → pex-2.59.5}/pex/vendor/_vendored/pip/pip/_vendor/certifi/cacert.pem

@@ -1,4 +1,4 @@
-# Updated via `nox -e update-certifi-cacert-pem` using certifi 2025.8.3
+# Updated via `nox -e update-certifi-cacert-pem` using certifi 2025.10.5
 
 
 # Issuer: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
@@ -4739,3 +4739,65 @@ rk4N3hY9A4GzJl5LuEsAz/+MF7psYC0nhzck5npgL7XTgwSqT0N1osGDsieYK7EO
 gLrAhV5Cud+xYJHT6xh+cHiudoO+cVrQkOPKwRYlZ0rwtnu64ZzZ
 -----END CERTIFICATE-----
 
+# Issuer: CN=OISTE Server Root ECC G1 O=OISTE Foundation
+# Subject: CN=OISTE Server Root ECC G1 O=OISTE Foundation
+# Label: "OISTE Server Root ECC G1"
+# Serial: 47819833811561661340092227008453318557
+# MD5 Fingerprint: 42:a7:d2:35:ae:02:92:db:19:76:08:de:2f:05:b4:d4
+# SHA1 Fingerprint: 3b:f6:8b:09:ae:2a:92:7b:ba:e3:8d:3f:11:95:d9:e6:44:0c:45:e2
+# SHA256 Fingerprint: ee:c9:97:c0:c3:0f:21:6f:7e:3b:8b:30:7d:2b:ae:42:41:2d:75:3f:c8:21:9d:af:d1:52:0b:25:72:85:0f:49
+-----BEGIN CERTIFICATE-----
+MIICNTCCAbqgAwIBAgIQI/nD1jWvjyhLH/BU6n6XnTAKBggqhkjOPQQDAzBLMQsw
+CQYDVQQGEwJDSDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UEAwwY
+T0lTVEUgU2VydmVyIFJvb3QgRUNDIEcxMB4XDTIzMDUzMTE0NDIyOFoXDTQ4MDUy
+NDE0NDIyN1owSzELMAkGA1UEBhMCQ0gxGTAXBgNVBAoMEE9JU1RFIEZvdW5kYXRp
+b24xITAfBgNVBAMMGE9JU1RFIFNlcnZlciBSb290IEVDQyBHMTB2MBAGByqGSM49
+AgEGBSuBBAAiA2IABBcv+hK8rBjzCvRE1nZCnrPoH7d5qVi2+GXROiFPqOujvqQy
+cvO2Ackr/XeFblPdreqqLiWStukhEaivtUwL85Zgmjvn6hp4LrQ95SjeHIC6XG4N
+2xml4z+cKrhAS93mT6NjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBQ3
+TYhlz/w9itWj8UnATgwQb0K0nDAdBgNVHQ4EFgQUN02IZc/8PYrVo/FJwE4MEG9C
+tJwwDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2kAMGYCMQCpKjAd0MKfkFFR
+QD6VVCHNFmb3U2wIFjnQEnx/Yxvf4zgAOdktUyBFCxxgZzFDJe0CMQCSia7pXGKD
+YmH5LVerVrkR3SW+ak5KGoJr3M/TvEqzPNcum9v4KGm8ay3sMaE641c=
+-----END CERTIFICATE-----
+
+# Issuer: CN=OISTE Server Root RSA G1 O=OISTE Foundation
+# Subject: CN=OISTE Server Root RSA G1 O=OISTE Foundation
+# Label: " OISTE Server Root RSA G1"
+# Serial: 113845518112613905024960613408179309848
+# MD5 Fingerprint: 23:a7:9e:d4:70:b8:b9:14:57:41:8a:7e:44:59:e2:68
+# SHA1 Fingerprint: f7:00:34:25:94:88:68:31:e4:34:87:3f:70:fe:86:b3:86:9f:f0:6e
+# SHA256 Fingerprint: 9a:e3:62:32:a5:18:9f:fd:db:35:3d:fd:26:52:0c:01:53:95:d2:27:77:da:c5:9d:b5:7b:98:c0:89:a6:51:e6
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIQVaXZZ5Qoxu0M+ifdWwFNGDANBgkqhkiG9w0BAQwFADBL
+MQswCQYDVQQGEwJDSDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UE
+AwwYT0lTVEUgU2VydmVyIFJvb3QgUlNBIEcxMB4XDTIzMDUzMTE0MzcxNloXDTQ4
+MDUyNDE0MzcxNVowSzELMAkGA1UEBhMCQ0gxGTAXBgNVBAoMEE9JU1RFIEZvdW5k
+YXRpb24xITAfBgNVBAMMGE9JU1RFIFNlcnZlciBSb290IFJTQSBHMTCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAKqu9KuCz/vlNwvn1ZatkOhLKdxVYOPM
+vLO8LZK55KN68YG0nnJyQ98/qwsmtO57Gmn7KNByXEptaZnwYx4M0rH/1ow00O7b
+rEi56rAUjtgHqSSY3ekJvqgiG1k50SeH3BzN+Puz6+mTeO0Pzjd8JnduodgsIUzk
+ik/HEzxux9UTl7Ko2yRpg1bTacuCErudG/L4NPKYKyqOBGf244ehHa1uzjZ0Dl4z
+O8vbUZeUapU8zhhabkvG/AePLhq5SvdkNCncpo1Q4Y2LS+VIG24ugBA/5J8bZT8R
+tOpXaZ+0AOuFJJkk9SGdl6r7NH8CaxWQrbueWhl/pIzY+m0o/DjH40ytas7ZTpOS
+jswMZ78LS5bOZmdTaMsXEY5Z96ycG7mOaES3GK/m5Q9l3JUJsJMStR8+lKXHiHUh
+sd4JJCpM4rzsTGdHwimIuQq6+cF0zowYJmXa92/GjHtoXAvuY8BeS/FOzJ8vD+Ho
+mnqT8eDI278n5mUpezbgMxVz8p1rhAhoKzYHKyfMeNhqhw5HdPSqoBNdZH702xSu
++zrkL8Fl47l6QGzwBrd7KJvX4V84c5Ss2XCTLdyEr0YconosP4EmQufU2MVshGYR
+i3drVByjtdgQ8K4p92cIiBdcuJd5z+orKu5YM+Vt6SmqZQENghPsJQtdLEByFSnT
+kCz3GkPVavBpAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAU
+8snBDw1jALvsRQ5KH7WxszbNDo0wHQYDVR0OBBYEFPLJwQ8NYwC77EUOSh+1sbM2
+zQ6NMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQwFAAOCAgEANGd5sjrG5T33
+I3K5Ce+SrScfoE4KsvXaFwyihdJ+klH9FWXXXGtkFu6KRcoMQzZENdl//nk6HOjG
+5D1rd9QhEOP28yBOqb6J8xycqd+8MDoX0TJD0KqKchxRKEzdNsjkLWd9kYccnbz8
+qyiWXmFcuCIzGEgWUOrKL+mlSdx/PKQZvDatkuK59EvV6wit53j+F8Bdh3foZ3dP
+AGav9LEDOr4SfEE15fSmG0eLy3n31r8Xbk5l8PjaV8GUgeV6Vg27Rn9vkf195hfk
+gSe7BYhW3SCl95gtkRlpMV+bMPKZrXJAlszYd2abtNUOshD+FKrDgHGdPY3ofRRs
+YWSGRqbXVMW215AWRqWFyp464+YTFrYVI8ypKVL9AMb2kI5Wj4kI3Zaq5tNqqYY1
+9tVFeEJKRvwDyF7YZvZFZSS0vod7VSCd9521Kvy5YhnLbDuv0204bKt7ph6N/Ome
+/msVuduCmsuY33OhkKCgxeDoAaijFJzIwZqsFVAzje18KotzlUBDJvyBpCpfOZC3
+J8tRd/iWkx7P8nd9H0aTolkelUTFLXVksNb54Dxp6gS1HAviRkRNQzuXSXERvSS2
+wq1yVAb+axj5d9spLFKebXd7Yv0PTY6YMjAwcRLWJTXjn/hvnLXrahut6hDTlhZy
+BiElxky8j3C7DOReIoMt0r7+hVu05L0=
+-----END CERTIFICATE-----
+

{pex-2.59.3 → pex-2.59.5}/pex/version.py

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

{pex-2.59.3 → pex-2.59.5}/pyproject.toml

@@ -256,11 +256,15 @@ hidden = true
 
 [tool.dev-cmd.commands.format]
 description = "Auto-format the source code."
-when = "python_version >= '3.9'"
+# N.B.: Our old version of black does not run under 3.14; so we pin to 3.11 for now to cover all
+# cases.
+python = "python3.11"
 args = ["scripts/format.py"]
 
 [tool.dev-cmd.commands.format-check]
-when = "python_version >= '3.9'"
+# N.B.: Our old version of black does not run under 3.14; so we pin to 3.11 for now to cover all
+# cases.
+python = "python3.11"
 args = ["scripts/format.py", "--check"]
 hidden = true
 
@@ -270,6 +274,7 @@ args = ["scripts/gen-scie-platform.py"]
 accepts-extra-args = true
 dependency-group = "gen-scie-platform"
 hidden = true
+
 [tool.dev-cmd.commands.gen-scie-platform.env]
 PYTHONPATH = "."
 # Used to get wheels for armv7l and riscv64.

{pex-2.59.3 → pex-2.59.5}/testing/bin/run_tests.py

@@ -49,7 +49,7 @@ from pex.compatibility import urlparse
 from pex.fs import safe_rename
 from pex.typing import TYPE_CHECKING, cast
 from pex.util import named_temporary_file
-from testing import devpi, pex_project_dir
+from testing import devpi, pex_dist, pex_project_dir
 
 if TYPE_CHECKING:
     from typing import Iterator, Optional, Tuple
@@ -266,6 +266,8 @@ def main():
 
     args = [sys.executable, "-m", "pytest", "-n", "auto", "-p", "testing.pytest_utils.shard"]
 
+    os.environ["_PEX_REQUIRES_PYTHON"] = pex_dist.requires_python()
+
     # When run under dev-cmd, FORCE_COLOR=1 is set to propagate auto-detection of a color terminal.
     # This affects a handful of our tests; so we discard and let the --color option below control
     # our own color output.

{pex-2.59.3 → pex-2.59.5}/testing/pex_dist.py

@@ -9,7 +9,9 @@ import os
 
 from pex import hashing
 from pex.atomic_directory import atomic_directory
+from pex.compatibility import ConfigParser
 from pex.pip.version import PipVersion
+from pex.typing import cast
 from pex.util import CacheHelper
 from pex.venv.virtualenv import InstallationChoice, Virtualenv
 from pex.version import __version__
@@ -73,3 +75,15 @@ def wheel():
     return os.path.join(
         pex_wheel_dir, "pex-{version}-py2.py3-none-any.whl".format(version=__version__)
     )
+
+
+def requires_python():
+    # type: () -> str
+
+    requires_python_override = os.environ.get("_PEX_REQUIRES_PYTHON")
+    if requires_python_override:
+        return requires_python_override
+
+    config_parser = ConfigParser()
+    config_parser.read(os.path.join(pex_project_dir(), "setup.cfg"))
+    return cast(str, config_parser.get("options", "python_requires"))

{pex-2.59.3 → pex-2.59.5}/tests/bin/test_sh_boot.py

@@ -1,12 +1,8 @@
 # Copyright 2022 Pex project contributors.
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-import os
-
-import pytest
 
 from pex import sh_boot
-from pex.compatibility import ConfigParser
 from pex.interpreter import PythonInterpreter
 from pex.interpreter_constraints import InterpreterConstraints, iter_compatible_versions
 from pex.interpreter_implementation import InterpreterImplementation
@@ -17,7 +13,7 @@ from pex.resolve import abbreviated_platforms
 from pex.sh_boot import PythonBinaryName
 from pex.targets import CompletePlatform, Targets
 from pex.third_party.packaging.specifiers import SpecifierSet
-from pex.typing import TYPE_CHECKING, cast
+from pex.typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Iterable, List
@@ -35,20 +31,8 @@ def calculate_binary_names(
     )
 
 
-@pytest.fixture
-def requires_python(pex_project_dir):
-    # type: (str) -> str
-    requires_python = os.environ.get("_PEX_REQUIRES_PYTHON")
-    if requires_python:
-        return requires_python
-
-    config_parser = ConfigParser()
-    config_parser.read(os.path.join(pex_project_dir, "setup.cfg"))
-    return cast(str, config_parser.get("options", "python_requires"))
-
-
 def expected(
-    requires_python,  # type: str
+    pex_requires_python,  # type: str
     *names  # type: PythonBinaryName
 ):
     # type: (...) -> List[str]
@@ -67,7 +51,10 @@ def expected(
         all_names.add(current_interpreter_identity.binary_name(version_components=2))
 
     supported_versions = sorted(
-        (version[:2] for version in set(iter_compatible_versions([SpecifierSet(requires_python)]))),
+        (
+            version[:2]
+            for version in set(iter_compatible_versions([SpecifierSet(pex_requires_python)]))
+        ),
         reverse=True,  # Newest (highest) version 1st.
     )
     for exe_name in "python", "pypy":
@@ -103,17 +90,17 @@ def expected(
     return list(all_names)
 
 
-def test_calculate_no_targets_no_ics(requires_python):
+def test_calculate_no_targets_no_ics(pex_requires_python):
     # type: (str) -> None
 
-    assert expected(requires_python) == calculate_binary_names()
+    assert expected(pex_requires_python) == calculate_binary_names()
 
 
-def test_calculate_platforms_no_ics(requires_python):
+def test_calculate_platforms_no_ics(pex_requires_python):
     # type: (str) -> None
 
     assert expected(
-        requires_python,
+        pex_requires_python,
         PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(3, 6)),
         PythonBinaryName(implementation=InterpreterImplementation.PYPY, version=(2, 7)),
     ) == calculate_binary_names(
@@ -127,7 +114,7 @@ def test_calculate_platforms_no_ics(requires_python):
 
 
 def test_calculate_interpreters_no_ics(
-    requires_python,  # type: str
+    pex_requires_python,  # type: str
     py27,  # type: PythonInterpreter
     py311,  # type: PythonInterpreter
     py310,  # type: PythonInterpreter
@@ -136,7 +123,7 @@ def test_calculate_interpreters_no_ics(
 
     assert (
         expected(
-            requires_python,
+            pex_requires_python,
             PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(2, 7)),
             PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(3, 11)),
             PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(3, 10)),
@@ -145,12 +132,12 @@ def test_calculate_interpreters_no_ics(
     )
 
 
-def test_calculate_no_targets_ics(requires_python):
+def test_calculate_no_targets_ics(pex_requires_python):
     # type: (str) -> None
 
     assert (
         expected(
-            requires_python,
+            pex_requires_python,
             PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(3, 7)),
             PythonBinaryName(implementation=InterpreterImplementation.PYPY, version=(3, 7)),
             PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(3, 8)),
@@ -164,13 +151,13 @@ def test_calculate_no_targets_ics(requires_python):
 
 
 def test_calculate_mixed(
-    requires_python,  # type: str
+    pex_requires_python,  # type: str
     py27,  # type: PythonInterpreter
 ):
     # type: (...) -> None
 
     assert expected(
-        requires_python,
+        pex_requires_python,
         PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(2, 7)),
         PythonBinaryName(implementation=InterpreterImplementation.PYPY, version=(3, 8)),
         PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(3, 6)),

{pex-2.59.3 → pex-2.59.5}/tests/conftest.py

@@ -34,6 +34,12 @@ def pex_wheel():
     return pex_dist.wheel()
 
 
+@pytest.fixture(scope="session")
+def pex_requires_python():
+    # type: () -> str
+    return pex_dist.requires_python()
+
+
 @pytest.fixture(scope="session")
 def tmpdir_factory(request):
     # type: (FixtureRequest) -> tmp.TempdirFactory

{pex-2.59.3 → pex-2.59.5}/tests/integration/cli/commands/test_pep_751.py

@@ -321,7 +321,8 @@ def iter_expected_devpi_server_deps(interpreter):
 
 
 @pytest.mark.skipif(
-    sys.version_info[:2] < (3, 10), reason="The lock under test requires Python >= 3.10."
+    sys.version_info[:2] < (3, 10) or sys.version_info[:2] >= (3, 14),
+    reason="The lock under test requires Python >=3.10,<3.14.",
 )
 def test_universal_export_interop(
     tmpdir,  # type: Tempdir
@@ -348,8 +349,7 @@ def test_universal_export_interop(
 
     assert_valid_toml(result.output)
 
-    interpreter = PythonInterpreter.get() if sys.version_info[:2] < (3, 14) else py310
-
+    interpreter = PythonInterpreter.get()
     venv_dir = tmpdir.join("venv")
     venv = Virtualenv.create(venv_dir=venv_dir, interpreter=interpreter)
     assert [] == list(venv.iter_distributions())