include skips due to requires-python in logged links

Author: ronaudinho

src/pip/_internal/index/package_finder.py

@@ -223,7 +223,7 @@ def evaluate_link(self, link: Link) -> Tuple[bool, Optional[str]]:
             ignore_requires_python=self._ignore_requires_python,
         )
         if not supports_python:
-            reason = f'{version} requires-python {link.requires_python}'
+            reason = f'{version} Requires-Python {link.requires_python}'
             return (False, reason)
 
         logger.debug("Found link %s, version: %s", link, version)
@@ -608,8 +608,7 @@ def __init__(
         self.format_control = format_control
 
         # These are boring links that have already been logged somehow.
-        self._logged_links = set()  # type: Set[Link]
-        self._logged_links_rp = set()  # type: Set[str]
+        self._logged_links = set()  # type: Set[Tuple[Link, str]]
 
     # Don't include an allow_yanked default value to make sure each call
     # site considers whether yanked releases are allowed. This also causes
@@ -699,6 +698,14 @@ def make_link_evaluator(self, project_name: str) -> LinkEvaluator:
             ignore_requires_python=self._ignore_requires_python,
         )
 
+    def skipped_links_requires_python(self):
+        # type: () -> List[str]
+        skips = [skip[1] for skip in self._logged_links if 'Requires-Python' in skip[1]]
+        # cleans duplicate package version found from different links
+        skips = list(dict.fromkeys(skips))
+        skips.sort()
+        return skips
+
     def logged_links_rp(self):
         # type: () -> List[str]
         skips = [skip for skip in self._logged_links_rp]
@@ -722,11 +729,11 @@ def _sort_links(self, links: Iterable[Link]) -> List[Link]:
         return no_eggs + eggs
 
     def _log_skipped_link(self, link: Link, reason: str) -> None:
-        if link not in self._logged_links:
+        if (link, reason) not in self._logged_links:
             # Put the link at the end so the reason is more visible and because
             # the link string is usually very long.
-            logger.debug("Skipping link: %s: %s", reason, link)
-            self._logged_links.add(link)
+            logger.debug('Skipping link: %s: %s', reason, link)
+            self._logged_links.add((link, reason))
 
     def get_install_candidate(
         self, link_evaluator: LinkEvaluator, link: Link
@@ -737,10 +744,7 @@ def get_install_candidate(
         """
         is_candidate, result = link_evaluator.evaluate_link(link)
         if not is_candidate:
-            if 'requires-python' in result:
-                self._log_skipped_link_rp(result)
-            else:
-                self._log_skipped_link(link, reason=result)
+            self._log_skipped_link(link, result)
             return None
 
         return InstallationCandidate(

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

@@ -579,7 +579,7 @@ def _report_single_requirement_conflict(
             req_disp = f"{req} (from {parent.name})"
 
         cands = self._finder.find_all_candidates(req.project_name)
-        skips = self._finder.logged_links_rp()
+        skips = self._finder.skipped_links_requires_python()
         versions = [str(v) for v in sorted({c.version for c in cands})]
 
         logger.critical(

tests/unit/test_index.py

@@ -114,7 +114,7 @@ class TestLinkEvaluator:
         [
             ((3, 6, 5), None, (True, "1.12")),
             # Test an incompatible Python.
-            ((3, 6, 4), None, (False, '1.12 requires-python == 3.6.5')),
+            ((3, 6, 4), None, (False, '1.12 Requires-Python == 3.6.5')),
             # Test an incompatible Python with ignore_requires_python=True.
             ((3, 6, 4), True, (True, "1.12")),
         ],