minor fixes and linting

Author: sanderr

src/pip/_internal/req/constructors.py

@@ -71,10 +71,14 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme
         flags=re.ASCII,
     )
     # ireq.req is a valid requirement so the regex should always match
-    assert match is not None, f"regex match on requirement {req} failed, this should never happen"
+    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)
-    assert pre is not None and post is not None, f"regex group selection for requirement {req} failed, this should never happen"
+    assert (
+        pre is not None and post is not None
+    ), f"regex group selection for requirement {req} failed, this should never happen"
     extras: str = "[%s]" % ",".join(sorted(new_extras)) if new_extras else ""
     return Requirement(f"{pre}{extras}{post}")
 

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

@@ -468,7 +468,7 @@ def _make_requirements_from_install_req(
             yield from ()
         elif not ireq.link:
             if ireq.extras and ireq.req is not None and ireq.req.specifier:
-                yield SpecifierWithoutExtrasRequirement(ireq),
+                yield SpecifierWithoutExtrasRequirement(ireq)
             yield SpecifierRequirement(ireq)
         else:
             self._fail_if_link_is_unsupported_wheel(ireq.link)

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

@@ -95,7 +95,8 @@ def is_satisfied_by(self, candidate: Candidate) -> bool:
 
 class SpecifierWithoutExtrasRequirement(SpecifierRequirement):
     """
-    Requirement backed by an install requirement on a base package. Trims extras from its install requirement if there are any.
+    Requirement backed by an install requirement on a base package.
+    Trims extras from its install requirement if there are any.
     """
 
     def __init__(self, ireq: InstallRequirement) -> None:

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

@@ -104,9 +104,13 @@ def resolve(
             raise error from e
 
         req_set = RequirementSet(check_supported_wheels=check_supported_wheels)
-        # process candidates with extras last to ensure their base equivalent is already in the req_set if appropriate
-        # Python's sort is stable so using a binary key function keeps relative order within both subsets
-        for candidate in sorted(result.mapping.values(), key=lambda c: c.name != c.project_name):
+        # process candidates with extras last to ensure their base equivalent is
+        # already in the req_set if appropriate.
+        # Python's sort is stable so using a binary key function keeps relative order
+        # within both subsets.
+        for candidate in sorted(
+            result.mapping.values(), key=lambda c: c.name != c.project_name
+        ):
             ireq = candidate.get_install_requirement()
             if ireq is None:
                 if candidate.name != candidate.project_name:

tests/unit/resolution_resolvelib/test_requirement.py

@@ -61,7 +61,7 @@ def test_new_resolver_requirement_has_name(
 ) -> None:
     """All requirements should have a name"""
     for spec, name, _ in test_cases:
-        reqs = factory.make_requirements_from_spec(spec, comes_from=None)
+        reqs = list(factory.make_requirements_from_spec(spec, comes_from=None))
         assert len(reqs) == 1
         assert reqs[0].name == name
 
@@ -71,7 +71,7 @@ def test_new_resolver_correct_number_of_matches(
 ) -> None:
     """Requirements should return the correct number of candidates"""
     for spec, _, match_count in test_cases:
-        reqs = factory.make_requirements_from_spec(spec, comes_from=None)
+        reqs = list(factory.make_requirements_from_spec(spec, comes_from=None))
         assert len(reqs) == 1
         req = reqs[0]
         matches = factory.find_candidates(
@@ -89,7 +89,7 @@ def test_new_resolver_candidates_match_requirement(
 ) -> None:
     """Candidates returned from find_candidates should satisfy the requirement"""
     for spec, _, _ in test_cases:
-        reqs = factory.make_requirements_from_spec(spec, comes_from=None)
+        reqs = list(factory.make_requirements_from_spec(spec, comes_from=None))
         assert len(reqs) == 1
         req = reqs[0]
         candidates = factory.find_candidates(
@@ -106,7 +106,7 @@ def test_new_resolver_candidates_match_requirement(
 
 def test_new_resolver_full_resolve(factory: Factory, provider: PipProvider) -> None:
     """A very basic full resolve"""
-    reqs = factory.make_requirements_from_spec("simplewheel", comes_from=None)
+    reqs = list(factory.make_requirements_from_spec("simplewheel", comes_from=None))
     assert len(reqs) == 1
     r: Resolver[Requirement, Candidate, str] = Resolver(provider, BaseReporter())
     result = r.resolve([reqs[0]])