Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert the exclusion of BAD_PACKAGES from batch_install #5275

Merged
merged 10 commits into from
Aug 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
echo ::set-output name=path::$(python -c "import sys; print(sys.executable)")
- name: Install latest pip, setuptools, wheel
run: |
python -m pip install --upgrade pip setuptools wheel --upgrade-strategy=eager
python -m pip install --upgrade pip setuptools wheel --upgrade
- name: Install dependencies
env:
PIPENV_DEFAULT_PYTHON_VERSION: ${{ matrix.python-version }}
Expand Down
135 changes: 76 additions & 59 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions pipenv/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -730,9 +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) and dep.name not in BAD_PACKAGES
dep for dep in deps_to_install if not project.environment.is_satisfied(dep)
]
sequential_dep_names = [d.name for d in sequential_deps]

Expand Down Expand Up @@ -1373,16 +1371,14 @@ def get_pip_args(
"upgrade": ["--upgrade"],
"require_hashes": ["--require-hashes"],
"no_build_isolation": ["--no-build-isolation"],
"no_use_pep517": [],
"no_use_pep517": ["--no-use-pep517"],
"no_deps": ["--no-deps"],
"selective_upgrade": [
"--upgrade-strategy=only-if-needed",
"--exists-action={}".format(project.s.PIP_EXISTS_ACTION or "i"),
],
"src_dir": src_dir,
}
# TODO: Why do we use no pep517?
arg_map["no_use_pep517"].append("--no-use-pep517")
arg_set = []
for key in arg_map.keys():
if key in locals() and locals().get(key):
Expand Down
2 changes: 1 addition & 1 deletion pipenv/patched/pip/_internal/locations/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

_PLATLIBDIR: str = getattr(sys, "platlibdir", "lib")

_USE_SYSCONFIG_DEFAULT = sys.version_info >= (3, 10)
_USE_SYSCONFIG_DEFAULT = sys.version_info >= (3, 7)


def _should_use_sysconfig() -> bool:
Expand Down
13 changes: 13 additions & 0 deletions tasks/vendoring/patches/patched/_post_pip_import.patch
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,16 @@ index 0ba06c52..6fdb59b7 100644


class LinkCandidate(_InstallRequirementBackedCandidate):
diff --git a/pipenv/patched/pip/_internal/locations/__init__.py b/pipenv/patched/pip/_internal/locations/__init__.py
index 23eaea64..fe5dd5b4 100644
--- a/pipenv/patched/pip/_internal/locations/__init__.py
+++ b/pipenv/patched/pip/_internal/locations/__init__.py
@@ -41,7 +41,7 @@ logger = logging.getLogger(__name__)

_PLATLIBDIR: str = getattr(sys, "platlibdir", "lib")

-_USE_SYSCONFIG_DEFAULT = sys.version_info >= (3, 10)
+_USE_SYSCONFIG_DEFAULT = sys.version_info >= (3, 7)


def _should_use_sysconfig() -> bool: