Merge pull request #9405 from MrMino/diagnostic_aversion

pypa · Feb 28, 2021 · 8223d29 · 8223d29
2 parents 1c46f30 + d1d9145
commit 8223d29
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/news/9139.feature.rst b/news/9139.feature.rst
@@ -0,0 +1 @@
+Bring back the "(from versions: ...)" message, that was shown on resolution failures.
diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
@@ -410,10 +410,17 @@ def _report_single_requirement_conflict(self, req, parent):
             req_disp = str(req)
         else:
             req_disp = f"{req} (from {parent.name})"
+
+        cands = self._finder.find_all_candidates(req.project_name)
+        versions = [str(v) for v in sorted({c.version for c in cands})]
+
         logger.critical(
-            "Could not find a version that satisfies the requirement %s",
+            "Could not find a version that satisfies the requirement %s "
+            "(from versions: %s)",
             req_disp,
+            ", ".join(versions) or "none",
         )
+
         return DistributionNotFound(f"No matching distribution found for {req}")
 
     def get_installation_error(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Bring back the "(from versions: ...)" message, that was shown on resolution failures.