pex 2.97.0__tar.gz → 2.97.2__tar.gz

{pex-2.97.0 → pex-2.97.2}/CHANGES.md

@@ -1,5 +1,17 @@
 # Release Notes
 
+## 2.97.2
+
+This release updates vendored Pip's vendored certifi's cacert.pem to that from certifi 2026.6.17.
+
+* Update vendored Pip's CA cert bundle. (#3202)
+
+## 2.97.1
+
+This release fixes `pex3 lock sync` to handle split `--style universal` locks.
+
+* Fix `pex3 lock sync` for split universal locks. (#3200)
+
 ## 2.97.0
 
 This release adds support for using `--scie-pbs-stripped` in combination with

{pex-2.97.0 → pex-2.97.2}/PKG-INFO

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

{pex-2.97.0 → pex-2.97.2}/pex/cli/commands/lock.py

@@ -81,6 +81,7 @@ from pex.resolve.target_system import TargetSystem, UniversalTarget
 from pex.result import Error, Ok, Result, try_
 from pex.sorted_tuple import SortedTuple
 from pex.targets import LocalInterpreter, Target, Targets
+from pex.third_party.packaging.markers import Marker
 from pex.tracer import TRACER
 from pex.typing import TYPE_CHECKING, cast
 from pex.venv.virtualenv import InvalidVirtualenvError, Virtualenv
@@ -1910,12 +1911,13 @@ class Lock(OutputMixin, JsonMixin, BuildTimeCommand):
                 requirement
             )
 
-        # TODO(John Sirois): Support multiple constraints for the same project name distinguished
-        #  by markers.
-        original_constraints_by_project_name = OrderedDict(
-            (constraint.project_name, OrderedSet([constraint]))
-            for constraint in lock_file.constraints
-        )
+        original_constraints_by_project_name = (
+            OrderedDict()
+        )  # type: OrderedDict[ProjectName, OrderedSet[Constraint]]
+        for constraint in lock_file.constraints:
+            original_constraints_by_project_name.setdefault(
+                constraint.project_name, OrderedSet()
+            ).add(constraint)
         constraints_by_project_name = original_constraints_by_project_name.copy()
 
         dry_run = self.options.dry_run
@@ -1991,8 +1993,26 @@ class Lock(OutputMixin, JsonMixin, BuildTimeCommand):
                         # grab the latest version in the range already constrained by an existing
                         # requirement or constraint.
                         if update_req and str(update_req) != update_req.name:
-                            constraints_by_project_name[project_name] = OrderedSet(
-                                [update_req.as_constraint()]
+                            constraints = constraints_by_project_name.setdefault(
+                                project_name, OrderedSet()
+                            )
+                            if resolve_update.updated_resolve.marker and update_req.marker:
+                                marker = Marker(
+                                    "({first}) and ({second})".format(
+                                        first=update_req.marker,
+                                        second=resolve_update.updated_resolve.marker,
+                                    )
+                                )
+                            elif resolve_update.updated_resolve.marker:
+                                marker = resolve_update.updated_resolve.marker
+                            else:
+                                marker = update_req.marker
+                            constraints.add(
+                                Constraint(
+                                    name=update_req.name,
+                                    specifier=update_req.specifier,
+                                    marker=marker,
+                                )
                             )
                     else:
                         print(

{pex-2.97.0 → pex-2.97.2}/pex/resolve/lockfile/targets.py

@@ -1,3 +1,6 @@
+# Copyright 2025 Pex project contributors.
+# Licensed under the Apache License, Version 2.0 (see LICENSE).
+
 from __future__ import absolute_import
 
 import itertools
@@ -86,6 +89,21 @@ def _calculate_split_markers(
     return split_markers
 
 
+def _group_patch_versions(patch_version_iter):
+    # type: (Iterator[Tuple[int, int, int]]) -> OrderedDict[Tuple[int, int], OrderedSet[Tuple[int, int, int]]]
+    grouped = OrderedDict()  # type: OrderedDict[Tuple[int, int], OrderedSet[Tuple[int, int, int]]]
+    for version in patch_version_iter:
+        major_minor = version[:2]  # type: Tuple[int, int]
+        value = grouped.get(major_minor, None)
+        if value is not None:
+            version_set = value
+        else:
+            version_set = OrderedSet()
+            grouped[major_minor] = version_set
+        version_set.add(version)
+    return grouped
+
+
 def _iter_universal_targets(
     universal_target,  # type: UniversalTarget
     split_markers,  # type: Mapping[str, Marker]
@@ -108,14 +126,26 @@ def _iter_universal_targets(
         has_marker(marker, "python_full_version") for marker in split_markers.values()
     )
     if has_python_full_version:
-        requires_pythons.update(
-            SpecifierSet(
-                "=={major}.{minor}.{patch}".format(
-                    major=version[0], minor=version[1], patch=version[2]
-                )
-            )
-            for version in iter_compatible_versions(universal_target.requires_python)
+        complete_version_sets = _group_patch_versions(iter_compatible_versions([]))
+        actual_version_sets = _group_patch_versions(
+            iter_compatible_versions(universal_target.requires_python)
         )
+        for major_minor, version_set in actual_version_sets.items():
+            if version_set == complete_version_sets.get(major_minor):
+                requires_pythons.add(
+                    SpecifierSet(
+                        "=={major}.{minor}.*".format(major=major_minor[0], minor=major_minor[1])
+                    )
+                )
+            else:
+                for version in version_set:
+                    requires_pythons.add(
+                        SpecifierSet(
+                            "=={major}.{minor}.{patch}".format(
+                                major=version[0], minor=version[1], patch=version[2]
+                            )
+                        )
+                    )
     elif has_python_version:
         requires_pythons.update(
             SpecifierSet("=={major}.{minor}.*".format(major=version[0], minor=version[1]))

{pex-2.97.0 → pex-2.97.2}/pex/resolve/lockfile/updater.py

@@ -12,6 +12,7 @@ from pex.artifact_url import ArtifactURL, Fingerprint
 from pex.common import pluralize
 from pex.dependency_configuration import DependencyConfiguration
 from pex.dist_metadata import Constraint, Requirement
+from pex.exceptions import production_assert
 from pex.network_configuration import NetworkConfiguration
 from pex.orderedset import OrderedSet
 from pex.pep_440 import Version
@@ -33,6 +34,7 @@ from pex.result import Error, ResultError, catch, try_
 from pex.sorted_tuple import SortedTuple
 from pex.targets import Target, Targets
 from pex.third_party.packaging import tags
+from pex.third_party.packaging.markers import Marker
 from pex.typing import TYPE_CHECKING
 from pex.util import named_temporary_file
 
@@ -287,15 +289,16 @@ class ResolveUpdater(object):
 
         deletes = tuple(original_requirements_by_project_name) if parsed_requirements else ()
 
-        # TODO(John Sirois): Support multiple constraints for the same project name distinguished
-        #  by markers.
-        original_constraints_by_project_name = OrderedDict(
-            (constraint.project_name, constraint) for constraint in lock_file.constraints
-        )  # type: OrderedDict[ProjectName, Constraint]
-
+        original_constraints_by_project_name = (
+            OrderedDict()
+        )  # type: OrderedDict[ProjectName, OrderedSet[Constraint]]
+        for constraint in lock_file.constraints:
+            original_constraints_by_project_name.setdefault(
+                constraint.project_name, OrderedSet()
+            ).add(constraint)
         update_constraints_by_project_name = (
             OrderedDict()
-        )  # type: OrderedDict[ProjectName, Constraint]
+        )  # type: OrderedDict[ProjectName, OrderedSet[Constraint]]
         for requirement in replace_requirements:
             project_name = requirement.project_name
             original_constraint = original_constraints_by_project_name.get(project_name)
@@ -305,7 +308,9 @@ class ResolveUpdater(object):
                         original=original_constraint, override=requirement
                     )
                 )
-            update_constraints_by_project_name[project_name] = requirement.as_constraint()
+            update_constraints_by_project_name.setdefault(project_name, OrderedSet()).add(
+                requirement.as_constraint()
+            )
 
         original_requirements = (
             OrderedDict()
@@ -355,13 +360,16 @@ class ResolveUpdater(object):
             (replacement.project_name, replacement) for replacement in replacements
         )
 
-        original_constraints_by_project_name = OrderedDict(
-            (constraint.project_name, constraint) for constraint in lock_file.constraints
-        )  # type: OrderedDict[ProjectName, Constraint]
-
+        original_constraints_by_project_name = (
+            OrderedDict()
+        )  # type: OrderedDict[ProjectName, OrderedSet[Constraint]]
+        for constraint in lock_file.constraints:
+            original_constraints_by_project_name.setdefault(
+                constraint.project_name, OrderedSet()
+            ).add(constraint)
         update_constraints_by_project_name = (
             OrderedDict()
-        )  # type: OrderedDict[ProjectName, Constraint]
+        )  # type: OrderedDict[ProjectName, OrderedSet[Constraint]]
         for change in itertools.chain(updates, replacements):
             project_name = change.project_name
             original_constraint = original_constraints_by_project_name.get(project_name)
@@ -371,7 +379,9 @@ class ResolveUpdater(object):
                         original=original_constraint, override=change
                     )
                 )
-            update_constraints_by_project_name[project_name] = change.as_constraint()
+            update_constraints_by_project_name.setdefault(project_name, OrderedSet()).add(
+                change.as_constraint()
+            )
 
         return cls(
             requirement_configuration=RequirementConfiguration(
@@ -392,7 +402,9 @@ class ResolveUpdater(object):
 
     requirement_configuration = attr.ib()  # type: RequirementConfiguration
     original_requirements = attr.ib()  # type: Iterable[Requirement]
-    update_constraints_by_project_name = attr.ib()  # type: Mapping[ProjectName, Constraint]
+    update_constraints_by_project_name = (
+        attr.ib()
+    )  # type: Mapping[ProjectName, Iterable[Constraint]]
     deletes = attr.ib()  # type: Container[ProjectName]
     pure_delete = attr.ib()  # type: bool
     lock_configuration = attr.ib()  # type: LockConfiguration
@@ -437,15 +449,33 @@ class ResolveUpdater(object):
             ):
                 continue
 
-            constraint = update_constraints_by_project_name.pop(
-                pin.project_name, pinned_requirement
-            )
-            constraints.append(str(constraint))
+            for constraint in update_constraints_by_project_name.pop(
+                pin.project_name, [pinned_requirement]
+            ):
+                if locked_resolve.marker and constraint.marker:
+                    marker = Marker(
+                        "({first}) and ({second})".format(
+                            first=constraint.marker, second=locked_resolve.marker
+                        )
+                    )
+                elif locked_resolve.marker:
+                    marker = locked_resolve.marker
+                else:
+                    marker = constraint.marker
+                constraints.append(
+                    str(
+                        Constraint(
+                            name=constraint.name, specifier=constraint.specifier, marker=marker
+                        )
+                    )
+                )
 
         # Any update constraints remaining are new requirements to resolve.
         requirements.update(
             as_parsed_requirement(constraint.as_requirement())
-            for constraint in update_constraints_by_project_name.values()
+            for constraint in itertools.chain.from_iterable(
+                update_constraints_by_project_name.values()
+            )
         )
 
         if not constraints:
@@ -536,8 +566,27 @@ class ResolveUpdater(object):
                             avoid_downloads=self.avoid_downloads,
                         )
                     )
-                    assert 1 == len(updated_lock_file.locked_resolves)
-                    updated_resolve = updated_lock_file.locked_resolves[0]
+                    if len(updated_lock_file.locked_resolves) == 1:
+                        updated_resolve = updated_lock_file.locked_resolves[0]
+                    else:
+                        candidate_updates = []
+                        for (index, lr) in enumerate(updated_lock_file.locked_resolves):
+                            if (
+                                lr.platform_tag == locked_resolve.platform_tag
+                                # N.B.: Older versions of packaging vendored for older Pythons don't
+                                # implement __eq__ for Marker; so we str(...)
+                                and str(lr.marker) == str(locked_resolve.marker)
+                            ):
+                                candidate_updates.append(lr)
+                        production_assert(
+                            len(candidate_updates) == 1,
+                            (
+                                "Update of locked resolve should have produced one result, "
+                                "found {count}."
+                            ),
+                            count=len(candidate_updates),
+                        )
+                        updated_resolve = candidate_updates[0]
                     updated_requirements = updated_lock_file.requirements
 
         updates = OrderedDict()  # type: OrderedDict[ProjectName, Optional[Update]]

{pex-2.97.0 → pex-2.97.2}/pex/vendor/__init__.py

@@ -256,9 +256,12 @@ class VendorSpec(
 #     Automated update of Pip's vendored certifi's cacert.pem to that from certifi 2026.2.25.
 # 17.) https://github.com/pex-tool/pip/commit/8723d5ac400942896f69ed777da53f26f766510c
 #     Automated update of Pip's vendored certifi's cacert.pem to that from certifi 2026.4.22.
+# 18.) https://github.com/pex-tool/pip/commit/cf6ef50395c26964787f1d13ae3de0f668fb2236
+#     Automated update of Pip's vendored certifi's cacert.pem to that from certifi 2026.6.17.
+
 PIP_SPEC = VendorSpec.git(
     repo="https://github.com/pex-tool/pip",
-    commit="8723d5ac400942896f69ed777da53f26f766510c",
+    commit="cf6ef50395c26964787f1d13ae3de0f668fb2236",
     project_name="pip",
     rewrite=False,
 )

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

@@ -0,0 +1 @@
+{"fingerprint":"8e3bd37a3b89f074675e6e9a5adbb61c9887043208fdcd11b565744c9fe63715","record_relpath":"pip-20.3.4.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix","sys_path_entries":["."]}

{pex-2.97.0 → pex-2.97.2}/pex/vendor/_vendored/pip/pip/_vendor/certifi/cacert.pem

@@ -1,4 +1,4 @@
-# Updated via `nox -e update-certifi-cacert-pem` using certifi 2026.4.22
+# Updated via `nox -e update-certifi-cacert-pem` using certifi 2026.6.17
 
 
 # Issuer: CN=COMODO ECC Certification Authority O=COMODO CA Limited
@@ -25,47 +25,6 @@ fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
 GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
 -----END CERTIFICATE-----
 
-# Issuer: O=Chunghwa Telecom Co., Ltd. OU=ePKI Root Certification Authority
-# Subject: O=Chunghwa Telecom Co., Ltd. OU=ePKI Root Certification Authority
-# Label: "ePKI Root Certification Authority"
-# Serial: 28956088682735189655030529057352760477
-# MD5 Fingerprint: 1b:2e:00:ca:26:06:90:3d:ad:fe:6f:15:68:d3:6b:b3
-# SHA1 Fingerprint: 67:65:0d:f1:7e:8e:7e:5b:82:40:a4:f4:56:4b:cf:e2:3d:69:c6:f0
-# SHA256 Fingerprint: c0:a6:f4:dc:63:a2:4b:fd:cf:54:ef:2a:6a:08:2a:0a:72:de:35:80:3e:2f:f5:ff:52:7a:e5:d8:72:06:df:d5
------BEGIN CERTIFICATE-----
-MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
-MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
-ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
-Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
-IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
-SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
-SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
-ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
-DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
-TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
-fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
-sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
-WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
-nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
-dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
-NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
-AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
-MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
-ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
-uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
-PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
-JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
-gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
-j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
-5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
-o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
-/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
-Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
-W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
-hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
------END CERTIFICATE-----
-
 # Issuer: CN=NetLock Arany (Class Gold) F\u0151tan\xfas\xedtv\xe1ny O=NetLock Kft. OU=Tan\xfas\xedtv\xe1nykiad\xf3k (Certification Services)
 # Subject: CN=NetLock Arany (Class Gold) F\u0151tan\xfas\xedtv\xe1ny O=NetLock Kft. OU=Tan\xfas\xedtv\xe1nykiad\xf3k (Certification Services)
 # Label: "NetLock Arany (Class Gold) F\u0151tan\xfas\xedtv\xe1ny"
@@ -3571,35 +3530,6 @@ xeSDwWrruoBa3lwtcHb4yOWHh8qgnaHlIhInD0Q9HWzq1MKLL295q39QpsQZp6F6
 t5b5wR9iWqJDB0BeJsas7a5wFsWqynKKTbDPAYsDP27X
 -----END CERTIFICATE-----
 
-# Issuer: CN=SecureSign Root CA12 O=Cybertrust Japan Co., Ltd.
-# Subject: CN=SecureSign Root CA12 O=Cybertrust Japan Co., Ltd.
-# Label: "SecureSign Root CA12"
-# Serial: 587887345431707215246142177076162061960426065942
-# MD5 Fingerprint: c6:89:ca:64:42:9b:62:08:49:0b:1e:7f:e9:07:3d:e8
-# SHA1 Fingerprint: 7a:22:1e:3d:de:1b:06:ac:9e:c8:47:70:16:8e:3c:e5:f7:6b:06:f4
-# SHA256 Fingerprint: 3f:03:4b:b5:70:4d:44:b2:d0:85:45:a0:20:57:de:93:eb:f3:90:5f:ce:72:1a:cb:c7:30:c0:6d:da:ee:90:4e
------BEGIN CERTIFICATE-----
-MIIDcjCCAlqgAwIBAgIUZvnHwa/swlG07VOX5uaCwysckBYwDQYJKoZIhvcNAQEL
-BQAwUTELMAkGA1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28u
-LCBMdGQuMR0wGwYDVQQDExRTZWN1cmVTaWduIFJvb3QgQ0ExMjAeFw0yMDA0MDgw
-NTM2NDZaFw00MDA0MDgwNTM2NDZaMFExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpD
-eWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2VjdXJlU2lnbiBS
-b290IENBMTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6OcE3emhF
-KxS06+QT61d1I02PJC0W6K6OyX2kVzsqdiUzg2zqMoqUm048luT9Ub+ZyZN+v/mt
-p7JIKwccJ/VMvHASd6SFVLX9kHrko+RRWAPNEHl57muTH2SOa2SroxPjcf59q5zd
-J1M3s6oYwlkm7Fsf0uZlfO+TvdhYXAvA42VvPMfKWeP+bl+sg779XSVOKik71gur
-FzJ4pOE+lEa+Ym6b3kaosRbnhW70CEBFEaCeVESE99g2zvVQR9wsMJvuwPWW0v4J
-hscGWa5Pro4RmHvzC1KqYiaqId+OJTN5lxZJjfU+1UefNzFJM3IFTQy2VYzxV4+K
-h9GtxRESOaCtAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
-AgEGMB0GA1UdDgQWBBRXNPN0zwRL1SXm8UC2LEzZLemgrTANBgkqhkiG9w0BAQsF
-AAOCAQEAPrvbFxbS8hQBICw4g0utvsqFepq2m2um4fylOqyttCg6r9cBg0krY6Ld
-mmQOmFxv3Y67ilQiLUoT865AQ9tPkbeGGuwAtEGBpE/6aouIs3YIcipJQMPTw4WJ
-mBClnW8Zt7vPemVV2zfrPIpyMpcemik+rY3moxtt9XUa5rBouVui7mlHJzWhhpmA
-8zNL4WukJsPvdFlseqJkth5Ew1DgDzk9qTPxpfPSvWKErI4cqc1avTc7bgoitPQV
-55FYxTpE05Uo2cBl6XLK0A+9H7MV2anjpEcJnuDLN/v9vZfVvhgaaaI5gdka9at/
-yOPiZwud9AzqVN/Ssq+xIvEg37xEHA==
------END CERTIFICATE-----
-
 # Issuer: CN=SecureSign Root CA14 O=Cybertrust Japan Co., Ltd.
 # Subject: CN=SecureSign Root CA14 O=Cybertrust Japan Co., Ltd.
 # Label: "SecureSign Root CA14"

{pex-2.97.0 → pex-2.97.2}/pex/vendor/_vendored/pip/pip-20.3.4.dist-info/RECORD

@@ -157,7 +157,7 @@ pip/_vendor/cachecontrol/caches/file_cache.py,sha256=nYVKsJtXh6gJXvdn1iWyrhxvkwp
 pip/_vendor/cachecontrol/caches/redis_cache.py,sha256=HxelMpNCo-dYr2fiJDwM3hhhRmxUYtB5tXm1GpAAT4Y,856
 pip/_vendor/certifi/__init__.py,sha256=TocBfHrqAkQK91W5jNYhRH8KKizxkkXZBk68DTHj0xo,62
 pip/_vendor/certifi/__main__.py,sha256=1k3Cr95vCxxGRGDljrW3wMdpZdL3Nhf0u1n-k2qdsCY,255
-pip/_vendor/certifi/cacert.pem,sha256=7NNnjibK_PtOUbHbjiws5WB2jCHMxcuV5KkyBtR6A5Y,238716
+pip/_vendor/certifi/cacert.pem,sha256=DWav_Pt1jsUWI2Kaf9HtyL1bG94VZHB7SqQ0fbwwUMM,234429
 pip/_vendor/certifi/core.py,sha256=jBrwKEWpG0IKcuozK0BQ2HHGp8adXAOyBPC7ddgR6vM,2315
 pip/_vendor/chardet/__init__.py,sha256=YsP5wQlsHJ2auF1RZJfypiSrCA7_bQiRm3ES_NI76-Y,1559
 pip/_vendor/chardet/big5freq.py,sha256=D_zK5GyzoVsRes0HkLJziltFQX0bKCLOrFe9_xDvO_8,31254

{pex-2.97.0 → pex-2.97.2}/pex/version.py

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

pex-2.97.2/tests/integration/cli/commands/test_issue_3194.py

@@ -0,0 +1,113 @@
+# Copyright 2026 Pex project contributors.
+# Licensed under the Apache License, Version 2.0 (see LICENSE).
+
+from __future__ import absolute_import
+
+import sys
+from collections import defaultdict
+
+import pytest
+
+from pex import targets
+from pex.interpreter import PythonInterpreter
+from pex.pep_440 import Version
+from pex.pep_503 import ProjectName
+from pex.resolve.lockfile import json_codec
+from pex.typing import TYPE_CHECKING
+from testing import PY27, PY311, ensure_python_interpreter
+from testing.cli import run_pex3
+from testing.pytest_utils.tmp import Tempdir
+
+if TYPE_CHECKING:
+    from typing import DefaultDict, List
+
+
+def assert_split_cowsay_lock(lock_file):
+    # type: (str) -> str
+
+    lock = json_codec.load(lock_file)
+    assert len(lock.locked_resolves) == 2
+    assert len(lock.locked_resolves[0].locked_requirements) == 1
+    assert len(lock.locked_resolves[1].locked_requirements) == 1
+
+    versions_by_project_name = defaultdict(list)  # type: DefaultDict[ProjectName, List[Version]]
+    for locked_resolve in lock.locked_resolves:
+        for locked_requirement in locked_resolve.locked_requirements:
+            versions_by_project_name[locked_requirement.pin.project_name].append(
+                locked_requirement.pin.version
+            )
+    assert len(versions_by_project_name) == 1, "Should only have locked the cowsay project."
+    locked_versions = versions_by_project_name.pop(ProjectName("cowsay"))
+    assert [Version("5"), Version("6")] == sorted(locked_versions)
+
+    return lock_file
+
+
+@pytest.fixture
+def pex_root(tmpdir):
+    # type: (Tempdir) -> str
+    return tmpdir.join("pex-root")
+
+
+@pytest.fixture
+def split_requirements_by_python_version_lock(
+    tmpdir,  # type: Tempdir
+    pex_root,  # type: str
+):
+    # type: (...) -> str
+
+    lock_file = tmpdir.join("lock.json")
+    run_pex3(
+        "lock",
+        "create",
+        "--pex-root",
+        pex_root,
+        "--style",
+        "universal",
+        "cowsay<6; python_version < '3'",
+        "cowsay==6; python_version >= '3'",
+        "--indent",
+        "2",
+        "-o",
+        lock_file,
+    ).assert_success()
+    return assert_split_cowsay_lock(lock_file)
+
+
+PYTHON2 = sys.executable if sys.version_info[0] == 2 else ensure_python_interpreter(PY27)
+PYTHON3 = sys.executable if sys.version_info[0] == 3 else ensure_python_interpreter(PY311)
+PYTHON3_VERSION_STR = PythonInterpreter.from_binary(PYTHON3).python
+PLATFORM_SYSTEM = targets.current().marker_environment.platform_system
+
+
+def test_sync_split_universal_lock(
+    tmpdir,  # type: Tempdir
+    split_requirements_by_python_version_lock,  # type: str
+    pex_root,  # type: str
+):
+    # type: (...) -> None
+
+    result = run_pex3(
+        "lock",
+        "sync",
+        "--pex-root",
+        pex_root,
+        "--style",
+        "universal",
+        "cowsay<6; python_version < '3'",
+        "cowsay==6; python_version >= '3'",
+        "--indent",
+        "2",
+        "--lock",
+        split_requirements_by_python_version_lock,
+        "--dry-run",
+        "check",
+    )
+    result.assert_success()
+    assert 2 == len(
+        [
+            line
+            for line in result.error.splitlines()
+            if "No updates for lock generated by universal " in line
+        ]
+    )

{pex-2.97.0 → pex-2.97.2}/tests/integration/test_reproducible.py

@@ -111,11 +111,22 @@ def assert_reproducible_build(
 @pytest.fixture(scope="module")
 def major_compatible_pythons():
     # type: () -> Tuple[str, ...]
-    return (
-        (sys.executable, ensure_python_interpreter(PY27))
-        if PY2
-        else (sys.executable, ensure_python_interpreter(PY310), ensure_python_interpreter(PY311))
-    )
+    if PY2:
+        return sys.executable, ensure_python_interpreter(PY27)
+    else:
+        pythons = sys.executable, ensure_python_interpreter(PY310), ensure_python_interpreter(PY311)
+        pip_version = compatible_pip_version(pythons)
+        if (
+            sys.version_info[:2] >= (3, 15)
+            and pip_version is not PipVersion.ADHOC
+            and pip_version <= PipVersion.v26_1_2
+        ):
+            pytest.skip(
+                "Pex under Python>=3.15 requires the Pip fix in "
+                "https://github.com/pypa/pip/commit/7456712c30e7bd8944f6d92fba60b7fcfe62017b which "
+                "will be included in Pip 26.2 to maintain proper build isolation."
+            )
+        return pythons
 
 
 @pytest.fixture(scope="module")

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

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