Merge constraints into a single SpecifierSet

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

@@ -24,8 +24,8 @@ class Requirement(object):
         # type: () -> str
         raise NotImplementedError("Subclass should override")
 
-    def find_matches(self, constraints):
-        # type: (Sequence[SpecifierSet]) -> Sequence[Candidate]
+    def find_matches(self, constraint):
+        # type: (SpecifierSet) -> Sequence[Candidate]
         raise NotImplementedError("Subclass should override")
 
     def is_satisfied_by(self, candidate):

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

@@ -182,7 +182,7 @@ class Factory(object):
             cand = self._make_candidate_from_link(
                 ireq.link, extras=set(ireq.extras), parent=ireq,
             )
-            return ExplicitRequirement(cand, factory=self)
+            return ExplicitRequirement(cand)
         return SpecifierRequirement(ireq, factory=self)
 
     def make_requirement_from_spec(self, specifier, comes_from):

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

@@ -1,11 +1,10 @@
+from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.resolvelib.providers import AbstractProvider
 
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 
 if MYPY_CHECK_RUNNING:
-    from typing import Any, Dict, List, Optional, Sequence, Tuple, Union
-
-    from pip._vendor.packaging.specifiers import SpecifierSet
+    from typing import Any, Dict, Optional, Sequence, Tuple, Union
 
     from pip._internal.req.req_install import InstallRequirement
 
@@ -17,7 +16,7 @@ class PipProvider(AbstractProvider):
     def __init__(
         self,
         factory,  # type: Factory
-        constraints,  # type: Dict[str,List[SpecifierSet]]
+        constraints,  # type: Dict[str, SpecifierSet]
         ignore_dependencies,  # type: bool
     ):
         # type: (...) -> None
@@ -45,8 +44,8 @@ class PipProvider(AbstractProvider):
 
     def find_matches(self, requirement):
         # type: (Requirement) -> Sequence[Candidate]
-        constraints = self._constraints.get(requirement.name, [])
-        return requirement.find_matches(constraints)
+        constraint = self._constraints.get(requirement.name, SpecifierSet())
+        return requirement.find_matches(constraint)
 
     def is_satisfied_by(self, requirement, candidate):
         # type: (Requirement, Candidate) -> bool

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

@@ -17,10 +17,9 @@ if MYPY_CHECK_RUNNING:
 
 
 class ExplicitRequirement(Requirement):
-    def __init__(self, candidate, factory):
-        # type: (Candidate, Factory) -> None
+    def __init__(self, candidate):
+        # type: (Candidate) -> None
         self.candidate = candidate
-        self._factory = factory
 
     def __repr__(self):
         # type: () -> str
@@ -35,9 +34,9 @@ class ExplicitRequirement(Requirement):
         # No need to canonicalise - the candidate did this
         return self.candidate.name
 
-    def find_matches(self, constraints):
+    def find_matches(self, constraint):
         # type: (Sequence[SpecifierSet]) -> Sequence[Candidate]
-        if constraints:
+        if len(constraint) > 0:
             raise InstallationError(
                 "Could not satisfy constraints for '{}': "
                 "installation from path or url cannot be "
@@ -75,12 +74,15 @@ class SpecifierRequirement(Requirement):
         canonical_name = canonicalize_name(self._ireq.req.name)
         return format_name(canonical_name, self.extras)
 
-    def find_matches(self, constraints):
-        # type: (Sequence[SpecifierSet]) -> Sequence[Candidate]
-        it = self._factory.iter_found_candidates(self._ireq, self.extras)
-        return [c for c in it if all(
-            s.contains(c.version, prereleases=True) for s in constraints
-        )]
+    def find_matches(self, constraint):
+        # type: (SpecifierSet) -> Sequence[Candidate]
+        return [
+            c
+            for c in self._factory.iter_found_candidates(
+                self._ireq, self.extras
+            )
+            if constraint.contains(c.version, prereleases=True)
+        ]
 
     def is_satisfied_by(self, candidate):
         # type: (Candidate) -> bool
@@ -114,8 +116,10 @@ class RequiresPythonRequirement(Requirement):
         # type: () -> str
         return self._candidate.name
 
-    def find_matches(self, constraints):
+    def find_matches(self, constraint):
         # type: (Sequence[SpecifierSet]) -> Sequence[Candidate]
+        assert len(constraint) == 0, \
+            "RequiresPythonRequirement cannot have constraints"
         if self._candidate.version in self.specifier:
             return [self._candidate]
         return []

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

@@ -1,6 +1,5 @@
 import functools
 import logging
-from collections import defaultdict
 
 from pip._vendor import six
 from pip._vendor.packaging.utils import canonicalize_name
@@ -71,14 +70,17 @@ class Resolver(BaseResolver):
         # The persistent state that we care about is `root_reqs`.
         assert len(self.factory.root_reqs) == 0, "Factory is being re-used"
 
-        constraints = defaultdict(list)  # type: Dict[str,List[SpecifierSet]]
+        constraints = {}  # type: Dict[str, SpecifierSet]
         requirements = []
         for req in root_reqs:
             if req.constraint:
                 assert req.name
                 assert req.specifier
                 name = canonicalize_name(req.name)
-                constraints[name].append(req.specifier)
+                if name in constraints:
+                    constraints[name] = constraints[name] & req.specifier
+                else:
+                    constraints[name] = req.specifier
             else:
                 requirements.append(
                     self.factory.make_requirement_from_install_req(req)

tests/unit/resolution_resolvelib/test_requirement.py

@@ -1,4 +1,5 @@
 import pytest
+from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.resolvelib import BaseReporter, Resolver
 
 from pip._internal.resolution.resolvelib.base import Candidate
@@ -58,14 +59,14 @@ def test_new_resolver_correct_number_of_matches(test_cases, factory):
     """Requirements should return the correct number of candidates"""
     for spec, name, matches in test_cases:
         req = factory.make_requirement_from_spec(spec, comes_from=None)
-        assert len(req.find_matches([])) == matches
+        assert len(req.find_matches(SpecifierSet())) == matches
 
 
 def test_new_resolver_candidates_match_requirement(test_cases, factory):
     """Candidates returned from find_matches should satisfy the requirement"""
     for spec, name, matches in test_cases:
         req = factory.make_requirement_from_spec(spec, comes_from=None)
-        for c in req.find_matches([]):
+        for c in req.find_matches(SpecifierSet()):
             assert isinstance(c, Candidate)
             assert req.is_satisfied_by(c)