From 33cbabe20cfda8cd7c3e62fc9731aa7776db7566 Mon Sep 17 00:00:00 2001 From: Frost Ming Date: Thu, 23 Dec 2021 15:20:11 +0800 Subject: [PATCH] fix pip location --- pipenv/patched/notpip/_internal/build_env.py | 2 +- .../patches/patched/_post_pip_import.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pipenv/patched/notpip/_internal/build_env.py b/pipenv/patched/notpip/_internal/build_env.py index 05457c5a..d8c66b3f 100644 --- a/pipenv/patched/notpip/_internal/build_env.py +++ b/pipenv/patched/notpip/_internal/build_env.py @@ -17,7 +17,7 @@ from pipenv.patched.notpip._vendor.certifi import where from pipenv.patched.notpip._vendor.packaging.requirements import Requirement from pipenv.patched.notpip._vendor.packaging.version import Version -from pipenv.patched.notpip import __file__ as pip_location +from pip import __file__ as pip_location from pipenv.patched.notpip._internal.cli.spinners import open_spinner from pipenv.patched.notpip._internal.locations import get_platlib, get_prefixed_libs, get_purelib from pipenv.patched.notpip._internal.metadata import get_environment diff --git a/tasks/vendoring/patches/patched/_post_pip_import.patch b/tasks/vendoring/patches/patched/_post_pip_import.patch index 4a9756ad..26cd89af 100644 --- a/tasks/vendoring/patches/patched/_post_pip_import.patch +++ b/tasks/vendoring/patches/patched/_post_pip_import.patch @@ -26,3 +26,16 @@ index 0ba06c52..6fdb59b7 100644 class LinkCandidate(_InstallRequirementBackedCandidate): +diff --git a/pipenv/patched/notpip/_internal/build_env.py b/pipenv/patched/notpip/_internal/build_env.py +index 05457c5a..d8c66b3f 100644 +--- a/pipenv/patched/notpip/_internal/build_env.py ++++ b/pipenv/patched/notpip/_internal/build_env.py +@@ -17,7 +17,7 @@ from pipenv.patched.notpip._vendor.certifi import where + from pipenv.patched.notpip._vendor.packaging.requirements import Requirement + from pipenv.patched.notpip._vendor.packaging.version import Version + +-from pipenv.patched.notpip import __file__ as pip_location ++from pip import __file__ as pip_location + from pipenv.patched.notpip._internal.cli.spinners import open_spinner + from pipenv.patched.notpip._internal.locations import get_platlib, get_prefixed_libs, get_purelib + from pipenv.patched.notpip._internal.metadata import get_environment