Merge branch 'main' into feature/no-download-for-dry-run

Author: notatallshaw

.github/workflows/ci.yml

@@ -201,6 +201,12 @@ jobs:
           python-version: ${{ matrix.python }}
           allow-prereleases: true
 
+      - name: Install SVN via Chocolatey
+        shell: pwsh
+        run: |
+          choco install svn -y --no-progress
+          echo "C:\Program Files (x86)\Subversion\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
       - run: pip install nox
 
       # Main check

news/13550.bugfix.rst

@@ -0,0 +1,2 @@
+For Python versions that do not support PEP 706, pip will now raise an installation error for a
+source distribution when it includes a symlink that points outside the source distribution archive.

news/13581.removal.rst

@@ -0,0 +1 @@
+Remove support for non-standard legacy wheel filenames.

src/pip/_internal/build_env.py

@@ -169,10 +169,14 @@ def install(
             args.append("--prefer-binary")
         args.append("--")
         args.extend(requirements)
+
+        identify_requirement = (
+            f" for {for_req.name}" if for_req and for_req.name else ""
+        )
         with open_spinner(f"Installing {kind}") as spinner:
             call_subprocess(
                 args,
-                command_desc=f"pip subprocess to install {kind}",
+                command_desc=f"installing {kind}{identify_requirement}",
                 spinner=spinner,
             )
 

src/pip/_internal/cache.py

@@ -143,7 +143,7 @@ def get(
                 wheel = Wheel(wheel_name)
             except InvalidWheelFilename:
                 continue
-            if canonicalize_name(wheel.name) != canonical_package_name:
+            if wheel.name != canonical_package_name:
                 logger.debug(
                     "Ignoring cached wheel %s for %s as it "
                     "does not match the expected distribution name %s.",

src/pip/_internal/exceptions.py

@@ -190,6 +190,23 @@ class InstallationError(PipError):
     """General exception during installation"""
 
 
+class FailedToPrepareCandidate(InstallationError):
+    """Raised when we fail to prepare a candidate (i.e. fetch and generate metadata).
+
+    This is intentionally not a diagnostic error, since the output will be presented
+    above this error, when this occurs. This should instead present information to the
+    user.
+    """
+
+    def __init__(
+        self, *, package_name: str, requirement_chain: str, failed_step: str
+    ) -> None:
+        super().__init__(f"Failed to build '{package_name}' when {failed_step.lower()}")
+        self.package_name = package_name
+        self.requirement_chain = requirement_chain
+        self.failed_step = failed_step
+
+
 class MissingPyProjectBuildRequires(DiagnosticPipError):
     """Raised when pyproject.toml has `build-system`, but no `build-system.requires`."""
 
@@ -384,7 +401,7 @@ def __init__(
         output_lines: list[str] | None,
     ) -> None:
         if output_lines is None:
-            output_prompt = Text("See above for output.")
+            output_prompt = Text("No available output.")
         else:
             output_prompt = (
                 Text.from_markup(f"[red][{len(output_lines)} lines of output][/]\n")
@@ -412,15 +429,15 @@ def __str__(self) -> str:
         return f"{self.command_description} exited with {self.exit_code}"
 
 
-class MetadataGenerationFailed(InstallationSubprocessError, InstallationError):
+class MetadataGenerationFailed(DiagnosticPipError, InstallationError):
     reference = "metadata-generation-failed"
 
     def __init__(
         self,
         *,
         package_details: str,
     ) -> None:
-        super(InstallationSubprocessError, self).__init__(
+        super().__init__(
             message="Encountered error while generating package metadata.",
             context=escape(package_details),
             hint_stmt="See above for details.",

src/pip/_internal/index/package_finder.py

@@ -17,7 +17,7 @@
 
 from pip._vendor.packaging import specifiers
 from pip._vendor.packaging.tags import Tag
-from pip._vendor.packaging.utils import canonicalize_name
+from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
 from pip._vendor.packaging.version import InvalidVersion, _BaseVersion
 from pip._vendor.packaging.version import parse as parse_version
 
@@ -127,7 +127,7 @@ class LinkEvaluator:
     def __init__(
         self,
         project_name: str,
-        canonical_name: str,
+        canonical_name: NormalizedName,
         formats: frozenset[str],
         target_python: TargetPython,
         allow_yanked: bool,
@@ -201,7 +201,7 @@ def evaluate_link(self, link: Link) -> tuple[LinkType, str]:
                         LinkType.format_invalid,
                         "invalid wheel filename",
                     )
-                if canonicalize_name(wheel.name) != self._canonical_name:
+                if wheel.name != self._canonical_name:
                     reason = f"wrong project name (not {self.project_name})"
                     return (LinkType.different_project, reason)
 

src/pip/_internal/metadata/__init__.py

@@ -4,13 +4,16 @@
 import functools
 import os
 import sys
-from typing import Literal, Protocol, cast
+from typing import TYPE_CHECKING, Literal, Protocol, cast
 
 from pip._internal.utils.deprecation import deprecated
 from pip._internal.utils.misc import strtobool
 
 from .base import BaseDistribution, BaseEnvironment, FilesystemWheel, MemoryWheel, Wheel
 
+if TYPE_CHECKING:
+    from pip._vendor.packaging.utils import NormalizedName
+
 __all__ = [
     "BaseDistribution",
     "BaseEnvironment",
@@ -131,7 +134,9 @@ def get_directory_distribution(directory: str) -> BaseDistribution:
     return select_backend().Distribution.from_directory(directory)
 
 
-def get_wheel_distribution(wheel: Wheel, canonical_name: str) -> BaseDistribution:
+def get_wheel_distribution(
+    wheel: Wheel, canonical_name: NormalizedName
+) -> BaseDistribution:
     """Get the representation of the specified wheel's distribution metadata.
 
     This returns a Distribution instance from the chosen backend based on

src/pip/_internal/models/wheel.py

@@ -4,91 +4,30 @@
 
 from __future__ import annotations
 
-import re
 from collections.abc import Iterable
 
 from pip._vendor.packaging.tags import Tag
-from pip._vendor.packaging.utils import BuildTag, parse_wheel_filename
 from pip._vendor.packaging.utils import (
     InvalidWheelFilename as _PackagingInvalidWheelFilename,
 )
+from pip._vendor.packaging.utils import parse_wheel_filename
 
 from pip._internal.exceptions import InvalidWheelFilename
-from pip._internal.utils.deprecation import deprecated
 
 
 class Wheel:
     """A wheel file"""
 
-    legacy_wheel_file_re = re.compile(
-        r"""^(?P<namever>(?P<name>[^\s-]+?)-(?P<ver>[^\s-]*?))
-        ((-(?P<build>\d[^-]*?))?-(?P<pyver>[^\s-]+?)-(?P<abi>[^\s-]+?)-(?P<plat>[^\s-]+?)
-        \.whl|\.dist-info)$""",
-        re.VERBOSE,
-    )
-
     def __init__(self, filename: str) -> None:
         self.filename = filename
 
-        # To make mypy happy specify type hints that can come from either
-        # parse_wheel_filename or the legacy_wheel_file_re match.
-        self.name: str
-        self._build_tag: BuildTag | None = None
-
         try:
             wheel_info = parse_wheel_filename(filename)
-            self.name, _version, self._build_tag, self.file_tags = wheel_info
-            self.version = str(_version)
         except _PackagingInvalidWheelFilename as e:
-            # Check if the wheel filename is in the legacy format
-            legacy_wheel_info = self.legacy_wheel_file_re.match(filename)
-            if not legacy_wheel_info:
-                raise InvalidWheelFilename(e.args[0]) from None
-
-            deprecated(
-                reason=(
-                    f"Wheel filename {filename!r} is not correctly normalised. "
-                    "Future versions of pip will raise the following error:\n"
-                    f"{e.args[0]}\n\n"
-                ),
-                replacement=(
-                    "to rename the wheel to use a correctly normalised "
-                    "name (this may require updating the version in "
-                    "the project metadata)"
-                ),
-                gone_in="25.3",
-                issue=12938,
-            )
-
-            self.name = legacy_wheel_info.group("name").replace("_", "-")
-            self.version = legacy_wheel_info.group("ver").replace("_", "-")
-
-            # Generate the file tags from the legacy wheel filename
-            pyversions = legacy_wheel_info.group("pyver").split(".")
-            abis = legacy_wheel_info.group("abi").split(".")
-            plats = legacy_wheel_info.group("plat").split(".")
-            self.file_tags = frozenset(
-                Tag(interpreter=py, abi=abi, platform=plat)
-                for py in pyversions
-                for abi in abis
-                for plat in plats
-            )
-
-    @property
-    def build_tag(self) -> BuildTag:
-        if self._build_tag is not None:
-            return self._build_tag
-
-        # Parse the build tag from the legacy wheel filename
-        legacy_wheel_info = self.legacy_wheel_file_re.match(self.filename)
-        assert legacy_wheel_info is not None, "guaranteed by filename validation"
-        build_tag = legacy_wheel_info.group("build")
-        match = re.match(r"^(\d+)(.*)$", build_tag)
-        assert match is not None, "guaranteed by filename validation"
-        build_tag_groups = match.groups()
-        self._build_tag = (int(build_tag_groups[0]), build_tag_groups[1])
-
-        return self._build_tag
+            raise InvalidWheelFilename(e.args[0]) from None
+
+        self.name, _version, self.build_tag, self.file_tags = wheel_info
+        self.version = str(_version)
 
     def get_formatted_file_tags(self) -> list[str]:
         """Return the wheel's tags as a sorted list of strings."""

src/pip/_internal/network/lazy_wheel.py

@@ -11,7 +11,7 @@
 from typing import Any
 from zipfile import BadZipFile, ZipFile
 
-from pip._vendor.packaging.utils import canonicalize_name
+from pip._vendor.packaging.utils import NormalizedName
 from pip._vendor.requests.models import CONTENT_CHUNK_SIZE, Response
 
 from pip._internal.metadata import BaseDistribution, MemoryWheel, get_wheel_distribution
@@ -23,7 +23,9 @@ class HTTPRangeRequestUnsupported(Exception):
     pass
 
 
-def dist_from_wheel_url(name: str, url: str, session: PipSession) -> BaseDistribution:
+def dist_from_wheel_url(
+    name: NormalizedName, url: str, session: PipSession
+) -> BaseDistribution:
     """Return a distribution object from the given wheel URL.
 
     This uses HTTP range requests to only fetch the portion of the wheel
@@ -37,7 +39,7 @@ def dist_from_wheel_url(name: str, url: str, session: PipSession) -> BaseDistrib
         wheel = MemoryWheel(zf.name, zf)  # type: ignore
         # After context manager exit, wheel.name
         # is an invalid file by intention.
-        return get_wheel_distribution(wheel, canonicalize_name(name))
+        return get_wheel_distribution(wheel, name)
 
 
 class LazyZipOverHTTP: