pip 25.1.1__py3-none-any.whl → 25.3__py3-none-any.whl

pip/_internal/req/constructors.py

@@ -8,12 +8,14 @@ These are meant to be used elsewhere within pip to create instances of
 InstallRequirement.
 """
 
+from __future__ import annotations
+
 import copy
 import logging
 import os
 import re
+from collections.abc import Collection
 from dataclasses import dataclass
-from typing import Collection, Dict, List, Optional, Set, Tuple, Union
 
 from pip._vendor.packaging.markers import Marker
 from pip._vendor.packaging.requirements import InvalidRequirement, Requirement
@@ -41,11 +43,11 @@ logger = logging.getLogger(__name__)
 operators = Specifier._operators.keys()
 
 
-def _strip_extras(path: str) -> Tuple[str, Optional[str]]:
+def _strip_extras(path: str) -> tuple[str, str | None]:
     m = re.match(r"^(.+)(\[[^\]]+\])$", path)
     extras = None
     if m:
-        path_no_extras = m.group(1)
+        path_no_extras = m.group(1).rstrip()
         extras = m.group(2)
     else:
         path_no_extras = path
@@ -53,19 +55,19 @@ def _strip_extras(path: str) -> Tuple[str, Optional[str]]:
     return path_no_extras, extras
 
 
-def convert_extras(extras: Optional[str]) -> Set[str]:
+def convert_extras(extras: str | None) -> set[str]:
     if not extras:
         return set()
     return get_requirement("placeholder" + extras.lower()).extras
 
 
-def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requirement:
+def _set_requirement_extras(req: Requirement, new_extras: set[str]) -> Requirement:
     """
     Returns a new requirement based on the given one, with the supplied extras. If the
     given requirement already has extras those are replaced (or dropped if no new extras
     are given).
     """
-    match: Optional[re.Match[str]] = re.fullmatch(
+    match: re.Match[str] | None = re.fullmatch(
         # see https://peps.python.org/pep-0508/#complete-grammar
         r"([\w\t .-]+)(\[[^\]]*\])?(.*)",
         str(req),
@@ -75,8 +77,8 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme
     assert (
         match is not None
     ), f"regex match on requirement {req} failed, this should never happen"
-    pre: Optional[str] = match.group(1)
-    post: Optional[str] = match.group(3)
+    pre: str | None = match.group(1)
+    post: str | None = match.group(3)
     assert (
         pre is not None and post is not None
     ), f"regex group selection for requirement {req} failed, this should never happen"
@@ -84,17 +86,25 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme
     return get_requirement(f"{pre}{extras}{post}")
 
 
-def parse_editable(editable_req: str) -> Tuple[Optional[str], str, Set[str]]:
-    """Parses an editable requirement into:
-        - a requirement name
-        - an URL
-        - extras
-        - editable options
-    Accepted requirements:
-        svn+http://blahblah@rev#egg=Foobar[baz]&subdirectory=version_subdir
-        .[some_extra]
-    """
+def _parse_direct_url_editable(editable_req: str) -> tuple[str | None, str, set[str]]:
+    try:
+        req = Requirement(editable_req)
+    except InvalidRequirement:
+        pass
+    else:
+        if req.url:
+            # Join the marker back into the name part. This will be parsed out
+            # later into a Requirement again.
+            if req.marker:
+                name = f"{req.name} ; {req.marker}"
+            else:
+                name = req.name
+            return (name, req.url, req.extras)
+
+    raise ValueError
 
+
+def _parse_pip_syntax_editable(editable_req: str) -> tuple[str | None, str, set[str]]:
     url = editable_req
 
     # If a file path is specified with extras, strip off the extras.
@@ -120,9 +130,27 @@ def parse_editable(editable_req: str) -> Tuple[Optional[str], str, Set[str]]:
             url = f"{version_control}+{url}"
             break
 
+    return Link(url).egg_fragment, url, set()
+
+
+def parse_editable(editable_req: str) -> tuple[str | None, str, set[str]]:
+    """Parses an editable requirement into:
+        - a requirement name with environment markers
+        - an URL
+        - extras
+    Accepted requirements:
+        - svn+http://blahblah@rev#egg=Foobar[baz]&subdirectory=version_subdir
+        - local_path[some_extra]
+        - Foobar[extra] @ svn+http://blahblah@rev#subdirectory=subdir ; markers
+    """
+    try:
+        package_name, url, extras = _parse_direct_url_editable(editable_req)
+    except ValueError:
+        package_name, url, extras = _parse_pip_syntax_editable(editable_req)
+
     link = Link(url)
 
-    if not link.is_vcs:
+    if not link.is_vcs and not link.url.startswith("file:"):
         backends = ", ".join(vcs.all_schemes)
         raise InstallationError(
             f"{editable_req} is not a valid editable requirement. "
@@ -130,13 +158,13 @@ def parse_editable(editable_req: str) -> Tuple[Optional[str], str, Set[str]]:
             f"(beginning with {backends})."
         )
 
-    package_name = link.egg_fragment
-    if not package_name:
+    # The project name can be inferred from local file URIs easily.
+    if not package_name and not link.url.startswith("file:"):
         raise InstallationError(
             f"Could not detect requirement name for '{editable_req}', "
-            "please specify one with #egg=your_package_name"
+            "please specify one with your_package_name @ URL"
         )
-    return package_name, url, set()
+    return package_name, url, extras
 
 
 def check_first_requirement_in_file(filename: str) -> None:
@@ -194,10 +222,10 @@ def deduce_helpful_msg(req: str) -> str:
 
 @dataclass(frozen=True)
 class RequirementParts:
-    requirement: Optional[Requirement]
-    link: Optional[Link]
-    markers: Optional[Marker]
-    extras: Set[str]
+    requirement: Requirement | None
+    link: Link | None
+    markers: Marker | None
+    extras: set[str]
 
 
 def parse_req_from_editable(editable_req: str) -> RequirementParts:
@@ -205,7 +233,7 @@ def parse_req_from_editable(editable_req: str) -> RequirementParts:
 
     if name is not None:
         try:
-            req: Optional[Requirement] = get_requirement(name)
+            req: Requirement | None = get_requirement(name)
         except InvalidRequirement as exc:
             raise InstallationError(f"Invalid requirement: {name!r}: {exc}")
     else:
@@ -221,16 +249,14 @@ def parse_req_from_editable(editable_req: str) -> RequirementParts:
 
 def install_req_from_editable(
     editable_req: str,
-    comes_from: Optional[Union[InstallRequirement, str]] = None,
+    comes_from: InstallRequirement | str | None = None,
     *,
-    use_pep517: Optional[bool] = None,
     isolated: bool = False,
-    global_options: Optional[List[str]] = None,
-    hash_options: Optional[Dict[str, List[str]]] = None,
+    hash_options: dict[str, list[str]] | None = None,
     constraint: bool = False,
     user_supplied: bool = False,
     permit_editable_wheels: bool = False,
-    config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
+    config_settings: dict[str, str | list[str]] | None = None,
 ) -> InstallRequirement:
     parts = parse_req_from_editable(editable_req)
 
@@ -242,9 +268,7 @@ def install_req_from_editable(
         permit_editable_wheels=permit_editable_wheels,
         link=parts.link,
         constraint=constraint,
-        use_pep517=use_pep517,
         isolated=isolated,
-        global_options=global_options,
         hash_options=hash_options,
         config_settings=config_settings,
         extras=parts.extras,
@@ -270,7 +294,7 @@ def _looks_like_path(name: str) -> bool:
     return False
 
 
-def _get_url_from_path(path: str, name: str) -> Optional[str]:
+def _get_url_from_path(path: str, name: str) -> str | None:
     """
     First, it checks whether a provided path is an installable directory. If it
     is, returns the path.
@@ -304,7 +328,7 @@ def _get_url_from_path(path: str, name: str) -> Optional[str]:
     return path_to_url(path)
 
 
-def parse_req_from_line(name: str, line_source: Optional[str]) -> RequirementParts:
+def parse_req_from_line(name: str, line_source: str | None) -> RequirementParts:
     if is_url(name):
         marker_sep = "; "
     else:
@@ -376,7 +400,7 @@ def parse_req_from_line(name: str, line_source: Optional[str]) -> RequirementPar
             raise InstallationError(msg)
 
     if req_as_string is not None:
-        req: Optional[Requirement] = _parse_req_string(req_as_string)
+        req: Requirement | None = _parse_req_string(req_as_string)
     else:
         req = None
 
@@ -385,16 +409,14 @@ def parse_req_from_line(name: str, line_source: Optional[str]) -> RequirementPar
 
 def install_req_from_line(
     name: str,
-    comes_from: Optional[Union[str, InstallRequirement]] = None,
+    comes_from: str | InstallRequirement | None = None,
     *,
-    use_pep517: Optional[bool] = None,
     isolated: bool = False,
-    global_options: Optional[List[str]] = None,
-    hash_options: Optional[Dict[str, List[str]]] = None,
+    hash_options: dict[str, list[str]] | None = None,
     constraint: bool = False,
-    line_source: Optional[str] = None,
+    line_source: str | None = None,
     user_supplied: bool = False,
-    config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
+    config_settings: dict[str, str | list[str]] | None = None,
 ) -> InstallRequirement:
     """Creates an InstallRequirement from a name, which might be a
     requirement, directory containing 'setup.py', filename, or URL.
@@ -409,9 +431,7 @@ def install_req_from_line(
         comes_from,
         link=parts.link,
         markers=parts.markers,
-        use_pep517=use_pep517,
         isolated=isolated,
-        global_options=global_options,
         hash_options=hash_options,
         config_settings=config_settings,
         constraint=constraint,
@@ -422,9 +442,8 @@ def install_req_from_line(
 
 def install_req_from_req_string(
     req_string: str,
-    comes_from: Optional[InstallRequirement] = None,
+    comes_from: InstallRequirement | None = None,
     isolated: bool = False,
-    use_pep517: Optional[bool] = None,
     user_supplied: bool = False,
 ) -> InstallRequirement:
     try:
@@ -453,7 +472,6 @@ def install_req_from_req_string(
         req,
         comes_from,
         isolated=isolated,
-        use_pep517=use_pep517,
         user_supplied=user_supplied,
     )
 
@@ -461,15 +479,13 @@ def install_req_from_req_string(
 def install_req_from_parsed_requirement(
     parsed_req: ParsedRequirement,
     isolated: bool = False,
-    use_pep517: Optional[bool] = None,
     user_supplied: bool = False,
-    config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
+    config_settings: dict[str, str | list[str]] | None = None,
 ) -> InstallRequirement:
     if parsed_req.is_editable:
         req = install_req_from_editable(
             parsed_req.requirement,
             comes_from=parsed_req.comes_from,
-            use_pep517=use_pep517,
             constraint=parsed_req.constraint,
             isolated=isolated,
             user_supplied=user_supplied,
@@ -480,13 +496,7 @@ def install_req_from_parsed_requirement(
         req = install_req_from_line(
             parsed_req.requirement,
             comes_from=parsed_req.comes_from,
-            use_pep517=use_pep517,
             isolated=isolated,
-            global_options=(
-                parsed_req.options.get("global_options", [])
-                if parsed_req.options
-                else []
-            ),
             hash_options=(
                 parsed_req.options.get("hashes", {}) if parsed_req.options else {}
             ),
@@ -507,9 +517,7 @@ def install_req_from_link_and_ireq(
         editable=ireq.editable,
         link=link,
         markers=ireq.markers,
-        use_pep517=ireq.use_pep517,
         isolated=ireq.isolated,
-        global_options=ireq.global_options,
         hash_options=ireq.hash_options,
         config_settings=ireq.config_settings,
         user_supplied=ireq.user_supplied,
@@ -530,9 +538,7 @@ def install_req_drop_extras(ireq: InstallRequirement) -> InstallRequirement:
         editable=ireq.editable,
         link=ireq.link,
         markers=ireq.markers,
-        use_pep517=ireq.use_pep517,
         isolated=ireq.isolated,
-        global_options=ireq.global_options,
         hash_options=ireq.hash_options,
         constraint=ireq.constraint,
         extras=[],

pip/_internal/req/req_dependency_group.py

@@ -1,17 +1,13 @@
-import sys
-from typing import Any, Dict, Iterable, Iterator, List, Tuple
-
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    from pip._vendor import tomli as tomllib
+from collections.abc import Iterable, Iterator
+from typing import Any
 
 from pip._vendor.dependency_groups import DependencyGroupResolver
 
 from pip._internal.exceptions import InstallationError
+from pip._internal.utils.compat import tomllib
 
 
-def parse_dependency_groups(groups: List[Tuple[str, str]]) -> List[str]:
+def parse_dependency_groups(groups: list[tuple[str, str]]) -> list[str]:
     """
     Parse dependency groups data as provided via the CLI, in a `[path:]group` syntax.
 
@@ -22,7 +18,7 @@ def parse_dependency_groups(groups: List[Tuple[str, str]]) -> List[str]:
 
 
 def _resolve_all_groups(
-    resolvers: Dict[str, DependencyGroupResolver], groups: List[Tuple[str, str]]
+    resolvers: dict[str, DependencyGroupResolver], groups: list[tuple[str, str]]
 ) -> Iterator[str]:
     """
     Run all resolution, converting any error from `DependencyGroupResolver` into
@@ -39,7 +35,7 @@ def _resolve_all_groups(
             ) from e
 
 
-def _build_resolvers(paths: Iterable[str]) -> Dict[str, Any]:
+def _build_resolvers(paths: Iterable[str]) -> dict[str, Any]:
     resolvers = {}
     for path in paths:
         if path in resolvers:
@@ -62,7 +58,7 @@ def _build_resolvers(paths: Iterable[str]) -> Dict[str, Any]:
     return resolvers
 
 
-def _load_pyproject(path: str) -> Dict[str, Any]:
+def _load_pyproject(path: str) -> dict[str, Any]:
     """
     This helper loads a pyproject.toml as TOML.
 

pip/_internal/req/req_file.py

@@ -2,6 +2,8 @@
 Requirements file parsing
 """
 
+from __future__ import annotations
+
 import codecs
 import locale
 import logging
@@ -11,19 +13,14 @@ import re
 import shlex
 import sys
 import urllib.parse
+from collections.abc import Generator, Iterable
 from dataclasses import dataclass
 from optparse import Values
 from typing import (
     TYPE_CHECKING,
     Any,
     Callable,
-    Dict,
-    Generator,
-    Iterable,
-    List,
     NoReturn,
-    Optional,
-    Tuple,
 )
 
 from pip._internal.cli import cmdoptions
@@ -36,9 +33,9 @@ if TYPE_CHECKING:
 
 __all__ = ["parse_requirements"]
 
-ReqFileLines = Iterable[Tuple[int, str]]
+ReqFileLines = Iterable[tuple[int, str]]
 
-LineParser = Callable[[str], Tuple[str, Values]]
+LineParser = Callable[[str], tuple[str, Values]]
 
 SCHEME_RE = re.compile(r"^(http|https|file):", re.I)
 COMMENT_RE = re.compile(r"(^|\s+)#.*$")
@@ -49,7 +46,7 @@ COMMENT_RE = re.compile(r"(^|\s+)#.*$")
 # 2013 Edition.
 ENV_VAR_RE = re.compile(r"(?P<var>\$\{(?P<name>[A-Z0-9_]+)\})")
 
-SUPPORTED_OPTIONS: List[Callable[..., optparse.Option]] = [
+SUPPORTED_OPTIONS: list[Callable[..., optparse.Option]] = [
     cmdoptions.index_url,
     cmdoptions.extra_index_url,
     cmdoptions.no_index,
@@ -67,13 +64,12 @@ SUPPORTED_OPTIONS: List[Callable[..., optparse.Option]] = [
 ]
 
 # options to be passed to requirements
-SUPPORTED_OPTIONS_REQ: List[Callable[..., optparse.Option]] = [
-    cmdoptions.global_options,
+SUPPORTED_OPTIONS_REQ: list[Callable[..., optparse.Option]] = [
     cmdoptions.hash,
     cmdoptions.config_settings,
 ]
 
-SUPPORTED_OPTIONS_EDITABLE_REQ: List[Callable[..., optparse.Option]] = [
+SUPPORTED_OPTIONS_EDITABLE_REQ: list[Callable[..., optparse.Option]] = [
     cmdoptions.config_settings,
 ]
 
@@ -86,7 +82,7 @@ SUPPORTED_OPTIONS_EDITABLE_REQ_DEST = [
 
 # order of BOMS is important: codecs.BOM_UTF16_LE is a prefix of codecs.BOM_UTF32_LE
 # so data.startswith(BOM_UTF16_LE) would be true for UTF32_LE data
-BOMS: List[Tuple[bytes, str]] = [
+BOMS: list[tuple[bytes, str]] = [
     (codecs.BOM_UTF8, "utf-8"),
     (codecs.BOM_UTF32, "utf-32"),
     (codecs.BOM_UTF32_BE, "utf-32-be"),
@@ -118,8 +114,8 @@ class ParsedRequirement:
     is_editable: bool
     comes_from: str
     constraint: bool
-    options: Optional[Dict[str, Any]]
-    line_source: Optional[str]
+    options: dict[str, Any] | None
+    line_source: str | None
 
 
 @dataclass(frozen=True)
@@ -137,7 +133,7 @@ class ParsedLine:
         return bool(self.opts.editables)
 
     @property
-    def requirement(self) -> Optional[str]:
+    def requirement(self) -> str | None:
         if self.args:
             return self.args
         elif self.is_editable:
@@ -148,9 +144,9 @@ class ParsedLine:
 
 def parse_requirements(
     filename: str,
-    session: "PipSession",
-    finder: Optional["PackageFinder"] = None,
-    options: Optional[optparse.Values] = None,
+    session: PipSession,
+    finder: PackageFinder | None = None,
+    options: optparse.Values | None = None,
     constraint: bool = False,
 ) -> Generator[ParsedRequirement, None, None]:
     """Parse a requirements file and yield ParsedRequirement instances.
@@ -187,7 +183,7 @@ def preprocess(content: str) -> ReqFileLines:
 
 def handle_requirement_line(
     line: ParsedLine,
-    options: Optional[optparse.Values] = None,
+    options: optparse.Values | None = None,
 ) -> ParsedRequirement:
     # preserve for the nested code path
     line_comes_from = "{} {} (line {})".format(
@@ -223,9 +219,9 @@ def handle_option_line(
     opts: Values,
     filename: str,
     lineno: int,
-    finder: Optional["PackageFinder"] = None,
-    options: Optional[optparse.Values] = None,
-    session: Optional["PipSession"] = None,
+    finder: PackageFinder | None = None,
+    options: optparse.Values | None = None,
+    session: PipSession | None = None,
 ) -> None:
     if opts.hashes:
         logger.warning(
@@ -291,10 +287,10 @@ def handle_option_line(
 
 def handle_line(
     line: ParsedLine,
-    options: Optional[optparse.Values] = None,
-    finder: Optional["PackageFinder"] = None,
-    session: Optional["PipSession"] = None,
-) -> Optional[ParsedRequirement]:
+    options: optparse.Values | None = None,
+    finder: PackageFinder | None = None,
+    session: PipSession | None = None,
+) -> ParsedRequirement | None:
     """Handle a single parsed requirements line; This can result in
     creating/yielding requirements, or updating the finder.
 
@@ -336,7 +332,7 @@ def handle_line(
 class RequirementsFileParser:
     def __init__(
         self,
-        session: "PipSession",
+        session: PipSession,
         line_parser: LineParser,
     ) -> None:
         self._session = session
@@ -354,7 +350,7 @@ class RequirementsFileParser:
         self,
         filename: str,
         constraint: bool,
-        parsed_files_stack: List[Dict[str, Optional[str]]],
+        parsed_files_stack: list[dict[str, str | None]],
     ) -> Generator[ParsedLine, None, None]:
         for line in self._parse_file(filename, constraint):
             if line.requirement is None and (
@@ -426,8 +422,8 @@ class RequirementsFileParser:
             )
 
 
-def get_line_parser(finder: Optional["PackageFinder"]) -> LineParser:
-    def parse_line(line: str) -> Tuple[str, Values]:
+def get_line_parser(finder: PackageFinder | None) -> LineParser:
+    def parse_line(line: str) -> tuple[str, Values]:
         # Build new parser for each line since it accumulates appendable
         # options.
         parser = build_parser()
@@ -450,7 +446,7 @@ def get_line_parser(finder: Optional["PackageFinder"]) -> LineParser:
     return parse_line
 
 
-def break_args_options(line: str) -> Tuple[str, str]:
+def break_args_options(line: str) -> tuple[str, str]:
     """Break up the line into an args and options string.  We only want to shlex
     (and then optparse) the options, not the args.  args can contain markers
     which are corrupted by shlex.
@@ -459,7 +455,7 @@ def break_args_options(line: str) -> Tuple[str, str]:
     args = []
     options = tokens[:]
     for token in tokens:
-        if token.startswith("-") or token.startswith("--"):
+        if token.startswith(("-", "--")):
             break
         else:
             args.append(token)
@@ -485,7 +481,7 @@ def build_parser() -> optparse.OptionParser:
 
     # By default optparse sys.exits on parsing errors. We want to wrap
     # that in our own exception.
-    def parser_exit(self: Any, msg: str) -> "NoReturn":
+    def parser_exit(self: Any, msg: str) -> NoReturn:
         raise OptionParsingError(msg)
 
     # NOTE: mypy disallows assigning to a method
@@ -500,7 +496,7 @@ def join_lines(lines_enum: ReqFileLines) -> ReqFileLines:
     comments).  The joined line takes on the index of the first line.
     """
     primary_line_number = None
-    new_line: List[str] = []
+    new_line: list[str] = []
     for line_number, line in lines_enum:
         if not line.endswith("\\") or COMMENT_RE.match(line):
             if COMMENT_RE.match(line):
@@ -564,7 +560,7 @@ def expand_env_variables(lines_enum: ReqFileLines) -> ReqFileLines:
         yield line_number, line
 
 
-def get_file_content(url: str, session: "PipSession") -> Tuple[str, str]:
+def get_file_content(url: str, session: PipSession) -> tuple[str, str]:
     """Gets the content of a file; it may be a filename, file: URL, or
     http: URL.  Returns (location, content).  Content is unicode.
     Respects # -*- coding: declarations on the retrieved files.