Merge pull request #8974 from NoahGorny/fix-new-resolver-upgrades-whe…

…n-not-needed-to
pypa · Oct 10, 2020 · 063f2ae · 063f2ae
2 parents 95dbf34 + 7e02958
commit 063f2ae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/news/8963.bugfix.rst b/news/8963.bugfix.rst
@@ -0,0 +1,2 @@
+Correctly search for installed distributions in new resolver logic in order
+to not miss packages (virtualenv packages from system-wide-packages for example)
diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
@@ -98,9 +98,15 @@ def __init__(
         self._editable_candidate_cache = {}  # type: Cache[EditableCandidate]
 
         if not ignore_installed:
+            packages = get_installed_distributions(
+                local_only=False,
+                include_editables=True,
+                editables_only=False,
+                user_only=False,
+                paths=None,
+            )
             self._installed_dists = {
-                canonicalize_name(dist.project_name): dist
-                for dist in get_installed_distributions()
+                canonicalize_name(p.key): p for p in packages
             }
         else:
             self._installed_dists = {}