From 960dca9949cf742b2766f9fc20277321f44cf09c Mon Sep 17 00:00:00 2001 From: Noah Gorny Date: Fri, 9 Oct 2020 16:32:09 +0300 Subject: [PATCH 1/2] resolvelib: factory: Get installed distributions correctly --- src/pip/_internal/resolution/resolvelib/factory.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 96e2d5331..3300cc8c5 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -98,9 +98,15 @@ class Factory(object): 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 = {} From 7e02958a1e03fffe0bb3b79c9d8a4f8f78d9ac03 Mon Sep 17 00:00:00 2001 From: Noah Gorny Date: Fri, 9 Oct 2020 16:44:09 +0300 Subject: [PATCH 2/2] Add news fragment for 8963 --- news/8963.bugfix.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 news/8963.bugfix.rst diff --git a/news/8963.bugfix.rst b/news/8963.bugfix.rst new file mode 100644 index 000000000..62c01b464 --- /dev/null +++ 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)