Implement extra-ed requirement merging

When a requirement is requested multiple times, some via a direct URL
("req @ URL") and some not but with extras ("req[extra] VERSION"), the
resolver previous could not correctly find "req[extra]" if "req" is
available in an index.

This additional logic makes the resolver, when encountering a
requirement with identifier "req[extra]", to also look for explicit
candidates listed under "req", and add them as found matches for
"req[extra]".

Author: uranusjr

news/8785.bugfix.rst

@@ -0,0 +1,4 @@
+New resolver: When a requirement is requested both via a direct URL
+(``req @ URL``) and via version specifier with extras (``req[extra]``), the
+resolver will now be able to use the URL to correctly resolve the requirement
+with extras.

src/pip/_internal/resolution/resolvelib/candidates.py

@@ -33,6 +33,18 @@
 ]
 
 
+def as_base_candidate(candidate: Candidate) -> Optional[BaseCandidate]:
+    """The runtime version of BaseCandidate."""
+    base_candidate_classes = (
+        AlreadyInstalledCandidate,
+        EditableCandidate,
+        LinkCandidate,
+    )
+    if isinstance(candidate, base_candidate_classes):
+        return candidate
+    return None
+
+
 def make_install_req_from_link(link, template):
     # type: (Link, InstallRequirement) -> InstallRequirement
     assert not template.editable, "template is editable"

src/pip/_internal/resolution/resolvelib/factory.py

@@ -16,6 +16,8 @@
     cast,
 )
 
+from pip._vendor.packaging.requirements import InvalidRequirement
+from pip._vendor.packaging.requirements import Requirement as PackagingRequirement
 from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
 from pip._vendor.pkg_resources import Distribution
@@ -54,6 +56,7 @@
     ExtrasCandidate,
     LinkCandidate,
     RequiresPythonCandidate,
+    as_base_candidate,
 )
 from .found_candidates import FoundCandidates, IndexCandidateInfo
 from .requirements import (
@@ -337,6 +340,28 @@ def find_candidates(
 
             explicit_candidates.add(candidate)
 
+        # If the current identifier contains extras, also add explicit
+        # candidates from entries from extra-less identifier.
+        try:
+            identifier_req = PackagingRequirement(identifier)
+        except InvalidRequirement:
+            base_identifier = None
+            extras: FrozenSet[str] = frozenset()
+        else:
+            base_identifier = identifier_req.name
+            extras = frozenset(identifier_req.extras)
+        if base_identifier and base_identifier in requirements:
+            for req in requirements[base_identifier]:
+                lookup_cand, _ = req.get_candidate_lookup()
+                if lookup_cand is None:  # Not explicit.
+                    continue
+                # We've stripped extras from the identifier, and should always
+                # get a BaseCandidate here, unless there's a bug elsewhere.
+                base_cand = as_base_candidate(lookup_cand)
+                assert base_cand is not None
+                candidate = self._make_extras_candidate(base_cand, extras)
+                explicit_candidates.add(candidate)
+
         # If none of the requirements want an explicit candidate, we can ask
         # the finder for candidates.
         if not explicit_candidates: