pip 25.1__py3-none-any.whl → 25.2__py3-none-any.whl

pip/_internal/network/lazy_wheel.py

@@ -1,11 +1,14 @@
 """Lazy ZIP over HTTP"""
 
+from __future__ import annotations
+
 __all__ = ["HTTPRangeRequestUnsupported", "dist_from_wheel_url"]
 
 from bisect import bisect_left, bisect_right
+from collections.abc import Generator
 from contextlib import contextmanager
 from tempfile import NamedTemporaryFile
-from typing import Any, Dict, Generator, List, Optional, Tuple
+from typing import Any
 from zipfile import BadZipFile, ZipFile
 
 from pip._vendor.packaging.utils import canonicalize_name
@@ -56,8 +59,8 @@ class LazyZipOverHTTP:
         self._length = int(head.headers["Content-Length"])
         self._file = NamedTemporaryFile()
         self.truncate(self._length)
-        self._left: List[int] = []
-        self._right: List[int] = []
+        self._left: list[int] = []
+        self._right: list[int] = []
         if "bytes" not in head.headers.get("Accept-Ranges", "none"):
             raise HTTPRangeRequestUnsupported("range request is not supported")
         self._check_zip()
@@ -117,7 +120,7 @@ class LazyZipOverHTTP:
         """Return the current position."""
         return self._file.tell()
 
-    def truncate(self, size: Optional[int] = None) -> int:
+    def truncate(self, size: int | None = None) -> int:
         """Resize the stream to the given size in bytes.
 
         If size is unspecified resize to the current position.
@@ -131,7 +134,7 @@ class LazyZipOverHTTP:
         """Return False."""
         return False
 
-    def __enter__(self) -> "LazyZipOverHTTP":
+    def __enter__(self) -> LazyZipOverHTTP:
         self._file.__enter__()
         return self
 
@@ -166,7 +169,7 @@ class LazyZipOverHTTP:
                     break
 
     def _stream_response(
-        self, start: int, end: int, base_headers: Dict[str, str] = HEADERS
+        self, start: int, end: int, base_headers: dict[str, str] = HEADERS
     ) -> Response:
         """Return HTTP response to a range request from start to end."""
         headers = base_headers.copy()
@@ -177,7 +180,7 @@ class LazyZipOverHTTP:
 
     def _merge(
         self, start: int, end: int, left: int, right: int
-    ) -> Generator[Tuple[int, int], None, None]:
+    ) -> Generator[tuple[int, int], None, None]:
         """Return a generator of intervals to be fetched.
 
         Args:

pip/_internal/network/session.py

@@ -2,6 +2,8 @@
 network request configuration and behavior.
 """
 
+from __future__ import annotations
+
 import email.utils
 import functools
 import io
@@ -16,16 +18,11 @@ import subprocess
 import sys
 import urllib.parse
 import warnings
+from collections.abc import Generator, Mapping, Sequence
 from typing import (
     TYPE_CHECKING,
     Any,
-    Dict,
-    Generator,
-    List,
-    Mapping,
     Optional,
-    Sequence,
-    Tuple,
     Union,
 )
 
@@ -54,18 +51,19 @@ if TYPE_CHECKING:
     from ssl import SSLContext
 
     from pip._vendor.urllib3.poolmanager import PoolManager
+    from pip._vendor.urllib3.proxymanager import ProxyManager
 
 
 logger = logging.getLogger(__name__)
 
-SecureOrigin = Tuple[str, str, Optional[Union[int, str]]]
+SecureOrigin = tuple[str, str, Optional[Union[int, str]]]
 
 
 # Ignore warning raised when using --trusted-host.
 warnings.filterwarnings("ignore", category=InsecureRequestWarning)
 
 
-SECURE_ORIGINS: List[SecureOrigin] = [
+SECURE_ORIGINS: list[SecureOrigin] = [
     # protocol, hostname, port
     # Taken from Chrome's list of secure origins (See: http://bit.ly/1qrySKC)
     ("https", "*", "*"),
@@ -112,7 +110,7 @@ def user_agent() -> str:
     """
     Return a string representing the user agent.
     """
-    data: Dict[str, Any] = {
+    data: dict[str, Any] = {
         "installer": {"name": "pip", "version": __version__},
         "python": platform.python_version(),
         "implementation": {
@@ -140,7 +138,7 @@ def user_agent() -> str:
         from pip._vendor import distro
 
         linux_distribution = distro.name(), distro.version(), distro.codename()
-        distro_infos: Dict[str, Any] = dict(
+        distro_infos: dict[str, Any] = dict(
             filter(
                 lambda x: x[1],
                 zip(["name", "version", "id"], linux_distribution),
@@ -214,10 +212,10 @@ class LocalFSAdapter(BaseAdapter):
         self,
         request: PreparedRequest,
         stream: bool = False,
-        timeout: Optional[Union[float, Tuple[float, float]]] = None,
-        verify: Union[bool, str] = True,
-        cert: Optional[Union[str, Tuple[str, str]]] = None,
-        proxies: Optional[Mapping[str, str]] = None,
+        timeout: float | tuple[float, float] | None = None,
+        verify: bool | str = True,
+        cert: str | tuple[str, str] | None = None,
+        proxies: Mapping[str, str] | None = None,
     ) -> Response:
         pathname = url_to_path(request.url)
 
@@ -264,7 +262,7 @@ class _SSLContextAdapterMixin:
     def __init__(
         self,
         *,
-        ssl_context: Optional["SSLContext"] = None,
+        ssl_context: SSLContext | None = None,
         **kwargs: Any,
     ) -> None:
         self._ssl_context = ssl_context
@@ -276,7 +274,7 @@ class _SSLContextAdapterMixin:
         maxsize: int,
         block: bool = DEFAULT_POOLBLOCK,
         **pool_kwargs: Any,
-    ) -> "PoolManager":
+    ) -> PoolManager:
         if self._ssl_context is not None:
             pool_kwargs.setdefault("ssl_context", self._ssl_context)
         return super().init_poolmanager(  # type: ignore[misc]
@@ -286,6 +284,13 @@ class _SSLContextAdapterMixin:
             **pool_kwargs,
         )
 
+    def proxy_manager_for(self, proxy: str, **proxy_kwargs: Any) -> ProxyManager:
+        # Proxy manager replaces the pool manager, so inject our SSL
+        # context here too. https://github.com/pypa/pip/issues/13288
+        if self._ssl_context is not None:
+            proxy_kwargs.setdefault("ssl_context", self._ssl_context)
+        return super().proxy_manager_for(proxy, **proxy_kwargs)  # type: ignore[misc]
+
 
 class HTTPAdapter(_SSLContextAdapterMixin, _BaseHTTPAdapter):
     pass
@@ -300,8 +305,8 @@ class InsecureHTTPAdapter(HTTPAdapter):
         self,
         conn: ConnectionPool,
         url: str,
-        verify: Union[bool, str],
-        cert: Optional[Union[str, Tuple[str, str]]],
+        verify: bool | str,
+        cert: str | tuple[str, str] | None,
     ) -> None:
         super().cert_verify(conn=conn, url=url, verify=False, cert=cert)
 
@@ -311,23 +316,23 @@ class InsecureCacheControlAdapter(CacheControlAdapter):
         self,
         conn: ConnectionPool,
         url: str,
-        verify: Union[bool, str],
-        cert: Optional[Union[str, Tuple[str, str]]],
+        verify: bool | str,
+        cert: str | tuple[str, str] | None,
     ) -> None:
         super().cert_verify(conn=conn, url=url, verify=False, cert=cert)
 
 
 class PipSession(requests.Session):
-    timeout: Optional[int] = None
+    timeout: int | None = None
 
     def __init__(
         self,
         *args: Any,
         retries: int = 0,
-        cache: Optional[str] = None,
+        cache: str | None = None,
         trusted_hosts: Sequence[str] = (),
-        index_urls: Optional[List[str]] = None,
-        ssl_context: Optional["SSLContext"] = None,
+        index_urls: list[str] | None = None,
+        ssl_context: SSLContext | None = None,
         **kwargs: Any,
     ) -> None:
         """
@@ -338,7 +343,7 @@ class PipSession(requests.Session):
 
         # Namespace the attribute with "pip_" just in case to prevent
         # possible conflicts with the base class.
-        self.pip_trusted_origins: List[Tuple[str, Optional[int]]] = []
+        self.pip_trusted_origins: list[tuple[str, int | None]] = []
         self.pip_proxy = None
 
         # Attach our User Agent to the request
@@ -401,7 +406,7 @@ class PipSession(requests.Session):
         for host in trusted_hosts:
             self.add_trusted_host(host, suppress_logging=True)
 
-    def update_index_urls(self, new_index_urls: List[str]) -> None:
+    def update_index_urls(self, new_index_urls: list[str]) -> None:
         """
         :param new_index_urls: New index urls to update the authentication
             handler with.
@@ -409,7 +414,7 @@ class PipSession(requests.Session):
         self.auth.index_urls = new_index_urls
 
     def add_trusted_host(
-        self, host: str, source: Optional[str] = None, suppress_logging: bool = False
+        self, host: str, source: str | None = None, suppress_logging: bool = False
     ) -> None:
         """
         :param host: It is okay to provide a host that has previously been

pip/_internal/network/utils.py

@@ -1,4 +1,4 @@
-from typing import Dict, Generator
+from collections.abc import Generator
 
 from pip._vendor.requests.models import Response
 
@@ -23,7 +23,7 @@ from pip._internal.exceptions import NetworkConnectionError
 # you're not asking for a compressed file and will then decompress it
 # before sending because if that's the case I don't think it'll ever be
 # possible to make this work.
-HEADERS: Dict[str, str] = {"Accept-Encoding": "identity"}
+HEADERS: dict[str, str] = {"Accept-Encoding": "identity"}
 
 DOWNLOAD_CHUNK_SIZE = 256 * 1024
 

pip/_internal/network/xmlrpc.py

@@ -3,7 +3,7 @@
 import logging
 import urllib.parse
 import xmlrpc.client
-from typing import TYPE_CHECKING, Tuple
+from typing import TYPE_CHECKING
 
 from pip._internal.exceptions import NetworkConnectionError
 from pip._internal.network.session import PipSession
@@ -36,7 +36,7 @@ class PipXmlrpcTransport(xmlrpc.client.Transport):
         handler: str,
         request_body: "SizedBuffer",
         verbose: bool = False,
-    ) -> Tuple["_Marshallable", ...]:
+    ) -> tuple["_Marshallable", ...]:
         assert isinstance(host, str)
         parts = (self._scheme, host, handler, None, None, None)
         url = urllib.parse.urlunparse(parts)

pip/_internal/operations/build/build_tracker.py

@@ -1,9 +1,11 @@
+from __future__ import annotations
+
 import contextlib
 import hashlib
 import logging
 import os
+from collections.abc import Generator
 from types import TracebackType
-from typing import Dict, Generator, Optional, Type, Union
 
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.utils.temp_dir import TempDirectory
@@ -17,7 +19,7 @@ def update_env_context_manager(**changes: str) -> Generator[None, None, None]:
 
     # Save values from the target and change them.
     non_existent_marker = object()
-    saved_values: Dict[str, Union[object, str]] = {}
+    saved_values: dict[str, object | str] = {}
     for name, new_value in changes.items():
         try:
             saved_values[name] = target[name]
@@ -38,7 +40,7 @@ def update_env_context_manager(**changes: str) -> Generator[None, None, None]:
 
 
 @contextlib.contextmanager
-def get_build_tracker() -> Generator["BuildTracker", None, None]:
+def get_build_tracker() -> Generator[BuildTracker, None, None]:
     root = os.environ.get("PIP_BUILD_TRACKER")
     with contextlib.ExitStack() as ctx:
         if root is None:
@@ -65,18 +67,18 @@ class BuildTracker:
 
     def __init__(self, root: str) -> None:
         self._root = root
-        self._entries: Dict[TrackerId, InstallRequirement] = {}
+        self._entries: dict[TrackerId, InstallRequirement] = {}
         logger.debug("Created build tracker: %s", self._root)
 
-    def __enter__(self) -> "BuildTracker":
+    def __enter__(self) -> BuildTracker:
         logger.debug("Entered build tracker: %s", self._root)
         return self
 
     def __exit__(
         self,
-        exc_type: Optional[Type[BaseException]],
-        exc_val: Optional[BaseException],
-        exc_tb: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
     ) -> None:
         self.cleanup()
 

pip/_internal/operations/build/wheel.py

@@ -1,6 +1,7 @@
+from __future__ import annotations
+
 import logging
 import os
-from typing import Optional
 
 from pip._vendor.pyproject_hooks import BuildBackendHookCaller
 
@@ -14,7 +15,7 @@ def build_wheel_pep517(
     backend: BuildBackendHookCaller,
     metadata_directory: str,
     tempd: str,
-) -> Optional[str]:
+) -> str | None:
     """Build one InstallRequirement using the PEP 517 build process.
 
     Returns path to wheel if successfully built. Otherwise, returns None.

pip/_internal/operations/build/wheel_editable.py

@@ -1,6 +1,7 @@
+from __future__ import annotations
+
 import logging
 import os
-from typing import Optional
 
 from pip._vendor.pyproject_hooks import BuildBackendHookCaller, HookMissing
 
@@ -14,7 +15,7 @@ def build_wheel_editable(
     backend: BuildBackendHookCaller,
     metadata_directory: str,
     tempd: str,
-) -> Optional[str]:
+) -> str | None:
     """Build one InstallRequirement using the PEP 660 build process.
 
     Returns path to wheel if successfully built. Otherwise, returns None.

pip/_internal/operations/build/wheel_legacy.py

@@ -1,6 +1,7 @@
+from __future__ import annotations
+
 import logging
 import os.path
-from typing import List, Optional
 
 from pip._internal.cli.spinners import open_spinner
 from pip._internal.utils.deprecation import deprecated
@@ -11,7 +12,7 @@ logger = logging.getLogger(__name__)
 
 
 def format_command_result(
-    command_args: List[str],
+    command_args: list[str],
     command_output: str,
 ) -> str:
     """Format command information for logging."""
@@ -31,12 +32,12 @@ def format_command_result(
 
 
 def get_legacy_build_wheel_path(
-    names: List[str],
+    names: list[str],
     temp_dir: str,
     name: str,
-    command_args: List[str],
+    command_args: list[str],
     command_output: str,
-) -> Optional[str]:
+) -> str | None:
     """Return the path to the wheel in the temporary build directory."""
     # Sort for determinism.
     names = sorted(names)
@@ -61,10 +62,10 @@ def build_wheel_legacy(
     name: str,
     setup_py_path: str,
     source_dir: str,
-    global_options: List[str],
-    build_options: List[str],
+    global_options: list[str],
+    build_options: list[str],
     tempd: str,
-) -> Optional[str]:
+) -> str | None:
     """Build one unpacked package using the "legacy" build process.
 
     Returns path to wheel if successfully built. Otherwise, returns None.

pip/_internal/operations/check.py

@@ -1,20 +1,15 @@
 """Validation of dependencies of packages"""
 
+from __future__ import annotations
+
 import logging
+from collections.abc import Generator, Iterable
 from contextlib import suppress
 from email.parser import Parser
 from functools import reduce
 from typing import (
     Callable,
-    Dict,
-    FrozenSet,
-    Generator,
-    Iterable,
-    List,
     NamedTuple,
-    Optional,
-    Set,
-    Tuple,
 )
 
 from pip._vendor.packaging.requirements import Requirement
@@ -32,21 +27,21 @@ logger = logging.getLogger(__name__)
 
 class PackageDetails(NamedTuple):
     version: Version
-    dependencies: List[Requirement]
+    dependencies: list[Requirement]
 
 
 # Shorthands
-PackageSet = Dict[NormalizedName, PackageDetails]
-Missing = Tuple[NormalizedName, Requirement]
-Conflicting = Tuple[NormalizedName, Version, Requirement]
+PackageSet = dict[NormalizedName, PackageDetails]
+Missing = tuple[NormalizedName, Requirement]
+Conflicting = tuple[NormalizedName, Version, Requirement]
 
-MissingDict = Dict[NormalizedName, List[Missing]]
-ConflictingDict = Dict[NormalizedName, List[Conflicting]]
-CheckResult = Tuple[MissingDict, ConflictingDict]
-ConflictDetails = Tuple[PackageSet, CheckResult]
+MissingDict = dict[NormalizedName, list[Missing]]
+ConflictingDict = dict[NormalizedName, list[Conflicting]]
+CheckResult = tuple[MissingDict, ConflictingDict]
+ConflictDetails = tuple[PackageSet, CheckResult]
 
 
-def create_package_set_from_installed() -> Tuple[PackageSet, bool]:
+def create_package_set_from_installed() -> tuple[PackageSet, bool]:
     """Converts a list of distributions into a PackageSet."""
     package_set = {}
     problems = False
@@ -64,7 +59,7 @@ def create_package_set_from_installed() -> Tuple[PackageSet, bool]:
 
 
 def check_package_set(
-    package_set: PackageSet, should_ignore: Optional[Callable[[str], bool]] = None
+    package_set: PackageSet, should_ignore: Callable[[str], bool] | None = None
 ) -> CheckResult:
     """Check if a package set is consistent
 
@@ -77,8 +72,8 @@ def check_package_set(
 
     for package_name, package_detail in package_set.items():
         # Info about dependencies of package_name
-        missing_deps: Set[Missing] = set()
-        conflicting_deps: Set[Conflicting] = set()
+        missing_deps: set[Missing] = set()
+        conflicting_deps: set[Conflicting] = set()
 
         if should_ignore and should_ignore(package_name):
             continue
@@ -108,7 +103,7 @@ def check_package_set(
     return missing, conflicting
 
 
-def check_install_conflicts(to_install: List[InstallRequirement]) -> ConflictDetails:
+def check_install_conflicts(to_install: list[InstallRequirement]) -> ConflictDetails:
     """For checking if the dependency graph would be consistent after \
     installing given requirements
     """
@@ -135,7 +130,7 @@ def check_unsupported(
     for p in packages:
         with suppress(FileNotFoundError):
             wheel_file = p.read_text("WHEEL")
-            wheel_tags: FrozenSet[Tag] = reduce(
+            wheel_tags: frozenset[Tag] = reduce(
                 frozenset.union,
                 map(parse_tag, Parser().parsestr(wheel_file).get_all("Tag", [])),
                 frozenset(),
@@ -145,8 +140,8 @@ def check_unsupported(
 
 
 def _simulate_installation_of(
-    to_install: List[InstallRequirement], package_set: PackageSet
-) -> Set[NormalizedName]:
+    to_install: list[InstallRequirement], package_set: PackageSet
+) -> set[NormalizedName]:
     """Computes the version of packages after installing to_install."""
     # Keep track of packages that were installed
     installed = set()
@@ -164,8 +159,8 @@ def _simulate_installation_of(
 
 
 def _create_whitelist(
-    would_be_installed: Set[NormalizedName], package_set: PackageSet
-) -> Set[NormalizedName]:
+    would_be_installed: set[NormalizedName], package_set: PackageSet
+) -> set[NormalizedName]:
     packages_affected = set(would_be_installed)
 
     for package_name in package_set:

pip/_internal/operations/freeze.py

@@ -1,8 +1,11 @@
+from __future__ import annotations
+
 import collections
 import logging
 import os
+from collections.abc import Container, Generator, Iterable
 from dataclasses import dataclass, field
-from typing import Container, Dict, Generator, Iterable, List, NamedTuple, Optional, Set
+from typing import NamedTuple
 
 from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
 from pip._vendor.packaging.version import InvalidVersion
@@ -21,19 +24,19 @@ logger = logging.getLogger(__name__)
 
 class _EditableInfo(NamedTuple):
     requirement: str
-    comments: List[str]
+    comments: list[str]
 
 
 def freeze(
-    requirement: Optional[List[str]] = None,
+    requirement: list[str] | None = None,
     local_only: bool = False,
     user_only: bool = False,
-    paths: Optional[List[str]] = None,
+    paths: list[str] | None = None,
     isolated: bool = False,
     exclude_editable: bool = False,
     skip: Container[str] = (),
 ) -> Generator[str, None, None]:
-    installations: Dict[str, FrozenRequirement] = {}
+    installations: dict[str, FrozenRequirement] = {}
 
     dists = get_environment(paths).iter_installed_distributions(
         local_only=local_only,
@@ -51,10 +54,10 @@ def freeze(
         # should only be emitted once, even if the same option is in multiple
         # requirements files, so we need to keep track of what has been emitted
         # so that we don't emit it again if it's seen again
-        emitted_options: Set[str] = set()
+        emitted_options: set[str] = set()
         # keep track of which files a requirement is in so that we can
         # give an accurate warning if a requirement appears multiple times.
-        req_files: Dict[str, List[str]] = collections.defaultdict(list)
+        req_files: dict[str, list[str]] = collections.defaultdict(list)
         for req_file_path in requirement:
             with open(req_file_path) as req_file:
                 for line in req_file:
@@ -83,7 +86,7 @@ def freeze(
                             yield line
                         continue
 
-                    if line.startswith("-e") or line.startswith("--editable"):
+                    if line.startswith(("-e", "--editable")):
                         if line.startswith("-e"):
                             line = line[2:].strip()
                         else:
@@ -233,7 +236,7 @@ class FrozenRequirement:
         return canonicalize_name(self.name)
 
     @classmethod
-    def from_dist(cls, dist: BaseDistribution) -> "FrozenRequirement":
+    def from_dist(cls, dist: BaseDistribution) -> FrozenRequirement:
         editable = dist.editable
         if editable:
             req, comments = _get_editable_info(dist)

pip/_internal/operations/install/editable_legacy.py

@@ -1,7 +1,9 @@
 """Legacy editable installation process, i.e. `setup.py develop`."""
 
+from __future__ import annotations
+
 import logging
-from typing import Optional, Sequence
+from collections.abc import Sequence
 
 from pip._internal.build_env import BuildEnvironment
 from pip._internal.utils.logging import indent_log
@@ -14,8 +16,8 @@ logger = logging.getLogger(__name__)
 def install_editable(
     *,
     global_options: Sequence[str],
-    prefix: Optional[str],
-    home: Optional[str],
+    prefix: str | None,
+    home: str | None,
     use_user_site: bool,
     name: str,
     setup_py_path: str,