From 60c2285b4caacc6b0414b467d87f48242bb79ef2 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Sun, 7 Aug 2022 18:22:25 -0400 Subject: [PATCH 1/2] Fix for inclusion of setuptools in the lock and install phase + other BAD_PACKAGES. --- pipenv/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipenv/core.py b/pipenv/core.py index 7583e396eb..26ad7c84f1 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -730,7 +730,7 @@ def batch_install( deps_to_install = deps_list[:] deps_to_install.extend(sequential_deps) deps_to_install = [ - dep for dep in deps_to_install if not project.environment.is_satisfied(dep) + dep for dep in deps_to_install if not project.environment.is_satisfied(dep) and dep.name not in BAD_PACKAGES ] sequential_dep_names = [d.name for d in sequential_deps] From 7fb66622865ee8e8a774beb201ea60351f0d1a13 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Sun, 7 Aug 2022 18:59:56 -0400 Subject: [PATCH 2/2] Fix linting --- pipenv/core.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pipenv/core.py b/pipenv/core.py index 26ad7c84f1..0b24086b6f 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -730,7 +730,9 @@ def batch_install( deps_to_install = deps_list[:] deps_to_install.extend(sequential_deps) deps_to_install = [ - dep for dep in deps_to_install if not project.environment.is_satisfied(dep) and dep.name not in BAD_PACKAGES + dep + for dep in deps_to_install + if not project.environment.is_satisfied(dep) and dep.name not in BAD_PACKAGES ] sequential_dep_names = [d.name for d in sequential_deps]