Add support for --pip-version 25.3.

Author: jsirois

.github/workflows/ci.yml

@@ -89,8 +89,8 @@ jobs:
           # Unit tests:
           # -----------
           - test-cmd: test-py27-pip20.3.4--patched
-          - test-cmd: test-py314-pip25.2
-          - test-cmd: test-py315-pip25.2
+          - test-cmd: test-py314-pip25.3
+          - test-cmd: test-py315-pip25.3
           - test-cmd: test-pypy311-pip24.3.1
 
           # Integration tests, split most into two shards:
@@ -104,14 +104,14 @@ jobs:
           - test-cmd: test-py38-pip22.3.1-integration
             pex-test-pos-args: --shard 2/2
 
-          - test-cmd: test-py314-pip25.2-integration
+          - test-cmd: test-py314-pip25.3-integration
             pex-test-pos-args: --shard 1/2
-          - test-cmd: test-py314-pip25.2-integration
+          - test-cmd: test-py314-pip25.3-integration
             pex-test-pos-args: --shard 2/2
 
-          - test-cmd: test-py315-pip25.2-integration
+          - test-cmd: test-py315-pip25.3-integration
             pex-test-pos-args: --shard 1/2
-          - test-cmd: test-py315-pip25.2-integration
+          - test-cmd: test-py315-pip25.3-integration
             pex-test-pos-args: --shard 2/2
 
           # PyPy is slow enough to require extra sharding.
@@ -162,12 +162,12 @@ jobs:
       matrix:
         include:
           - python-version: "3.14"
-            test-cmd: test-py314-pip25.2
+            test-cmd: test-py314-pip25.3
           - python-version: "3.14"
-            test-cmd: test-py314-pip25.2-integration
+            test-cmd: test-py314-pip25.3-integration
             pex-test-pos-args: --shard 1/2
           - python-version: "3.14"
-            test-cmd: test-py314-pip25.2-integration
+            test-cmd: test-py314-pip25.3-integration
             pex-test-pos-args: --shard 2/2
     steps:
       - name: Checkout Pex
@@ -253,19 +253,19 @@ jobs:
           - python-version: "3.11"
             test-cmd: typecheck package docs
           - python-version: "3.14"
-            test-cmd: test-py314-pip25.2
+            test-cmd: test-py314-pip25.3
             artifact-name: unit
             pex-test-pos-args: --junit-report ../dist/test-results/unit.xml
           - python-version: "3.14"
-            test-cmd: test-py314-pip25.2-integration
+            test-cmd: test-py314-pip25.3-integration
             artifact-name: integration-1
             pex-test-pos-args: --shard 1/3 --junit-report ../dist/test-results/integration-1.xml
           - python-version: "3.14"
-            test-cmd: test-py314-pip25.2-integration
+            test-cmd: test-py314-pip25.3-integration
             artifact-name: integration-2
             pex-test-pos-args: --shard 2/3 --junit-report ../dist/test-results/integration-2.xml
           - python-version: "3.14"
-            test-cmd: test-py314-pip25.2-integration
+            test-cmd: test-py314-pip25.3-integration
             artifact-name: integration-3
             pex-test-pos-args: --shard 3/3 --junit-report ../dist/test-results/integration-3.xml
     steps:

pex/pip/tool.py

@@ -552,8 +552,7 @@ def _spawn_pip_isolated_job(
         )
         return Job(command=command, process=process, finalizer=finalizer, context="pip")
 
-    @staticmethod
-    def _iter_build_configuration_options(build_configuration):
+    def _iter_build_configuration_options(self, build_configuration):
         # type: (BuildConfiguration) -> Iterator[str]
 
         # N.B.: BuildConfiguration maintains invariants that ensure --only-binary, --no-binary,
@@ -576,7 +575,8 @@ def _iter_build_configuration_options(build_configuration):
         if build_configuration.prefer_older_binary:
             yield "--prefer-binary"
 
-        if build_configuration.use_pep517 is not None:
+        # N.B.: In 25.3 `--use-pep517` became the default and only option.
+        if build_configuration.use_pep517 is not None and self.version < PipVersion.v25_3:
             yield "--use-pep517" if build_configuration.use_pep517 else "--no-use-pep517"
 
         if not build_configuration.build_isolation:

pex/pip/version.py

@@ -369,6 +369,13 @@ def latest_compatible(cls, target=None):
         requires_python=">=3.9,<3.16",
     )
 
+    v25_3 = PipVersionValue(
+        version="25.3",
+        setuptools_version="80.9.0",
+        wheel_version="0.45.1",
+        requires_python=">=3.9,<3.16",
+    )
+
     VENDORED = v20_3_4_patched
     LATEST = LatestPipVersion()
     LATEST_COMPATIBLE = LatestCompatiblePipVersion()

pex/resolve/locker.py

@@ -291,6 +291,16 @@ def _extract_resolve_data(artifact_url):
     def _maybe_record_wheel(self, url):
         # type: (str) -> ArtifactURL
         artifact_url = self.parse_url_and_maybe_record_fingerprint(url)
+
+        # N.B.: Lock resolves driven by `pip install --dry-run --report` will only consult PEP-658
+        # `.whl.metadata` side-car files in the happy path; so we must use these as a proxy for the
+        # `.whl` file they are paired with.
+        # See: https://peps.python.org/pep-0658/
+        if not self._lock_is_via_pip_download and artifact_url.url_info.path.endswith(".metadata"):
+            artifact_url = ArtifactURL.from_url_info(
+                artifact_url.url_info._replace(path=artifact_url.url_info.path[:-9])
+            )
+
         if artifact_url.is_wheel:
             pin, partial_artifact = self._extract_resolve_data(artifact_url)
 

tests/integration/test_issue_1560.py

@@ -8,6 +8,7 @@
 import pytest
 
 from pex.common import safe_open, touch
+from pex.pip.version import PipVersion
 from pex.typing import TYPE_CHECKING
 from testing import (
     IntegResults,
@@ -88,12 +89,14 @@ def build_pex(*extra_args):
     build_pex().assert_success()
     build_pex("--force-pep517").assert_success()
 
-    result = build_pex("--no-use-pep517")
-    result.assert_failure()
-    assert (
-        "ERROR: Disabling PEP 517 processing is invalid: project does not have a setup.py"
-        in result.error
-    )
+    # N.B.: In 25.3 `--use-pep517` became the default and only option.
+    if PipVersion.DEFAULT < PipVersion.v25_3:
+        result = build_pex("--no-use-pep517")
+        result.assert_failure()
+        assert (
+            "ERROR: Disabling PEP 517 processing is invalid: project does not have a setup.py"
+            in result.error
+        )
 
 
 def test_pep_517_for_legacy_project():
@@ -108,4 +111,7 @@ def assert_build_pex(*extra_args):
 
     assert_build_pex()
     assert_build_pex("--use-pep517")
-    assert_build_pex("--no-use-pep517")
+
+    # N.B.: In 25.3 `--use-pep517` became the default and only option.
+    if PipVersion.DEFAULT < PipVersion.v25_3:
+        assert_build_pex("--no-use-pep517")