mirror of
https://github.com/kennethreitz/pipenv.git
synced 2026-06-21 07:10:58 +00:00
Matt Davis
149 lines
5.9 KiB
Diff
149 lines
5.9 KiB
Diff
diff --git a/pipenv/patched/pip/_internal/commands/__init__.py b/pipenv/patched/pip/_internal/commands/__init__.py
|
|
index 858a41014..868a1cad9 100644
|
|
--- a/pipenv/patched/pip/_internal/commands/__init__.py
|
|
+++ b/pipenv/patched/pip/_internal/commands/__init__.py
|
|
@@ -14,92 +14,92 @@ CommandInfo = namedtuple("CommandInfo", "module_path, class_name, summary")
|
|
# - Enables avoiding additional (costly) imports for presenting `--help`.
|
|
# - The ordering matters for help display.
|
|
#
|
|
-# Even though the module path starts with the same "pip._internal.commands"
|
|
+# Even though the module path starts with the same "pipenv.patched.pip._internal.commands"
|
|
# prefix, the full path makes testing easier (specifically when modifying
|
|
# `commands_dict` in test setup / teardown).
|
|
commands_dict: Dict[str, CommandInfo] = {
|
|
"install": CommandInfo(
|
|
- "pip._internal.commands.install",
|
|
+ "pipenv.patched.pip._internal.commands.install",
|
|
"InstallCommand",
|
|
"Install packages.",
|
|
),
|
|
"download": CommandInfo(
|
|
- "pip._internal.commands.download",
|
|
+ "pipenv.patched.pip._internal.commands.download",
|
|
"DownloadCommand",
|
|
"Download packages.",
|
|
),
|
|
"uninstall": CommandInfo(
|
|
- "pip._internal.commands.uninstall",
|
|
+ "pipenv.patched.pip._internal.commands.uninstall",
|
|
"UninstallCommand",
|
|
"Uninstall packages.",
|
|
),
|
|
"freeze": CommandInfo(
|
|
- "pip._internal.commands.freeze",
|
|
+ "pipenv.patched.pip._internal.commands.freeze",
|
|
"FreezeCommand",
|
|
"Output installed packages in requirements format.",
|
|
),
|
|
"inspect": CommandInfo(
|
|
- "pip._internal.commands.inspect",
|
|
+ "pipenv.patched.pip._internal.commands.inspect",
|
|
"InspectCommand",
|
|
"Inspect the python environment.",
|
|
),
|
|
"list": CommandInfo(
|
|
- "pip._internal.commands.list",
|
|
+ "pipenv.patched.pip._internal.commands.list",
|
|
"ListCommand",
|
|
"List installed packages.",
|
|
),
|
|
"show": CommandInfo(
|
|
- "pip._internal.commands.show",
|
|
+ "pipenv.patched.pip._internal.commands.show",
|
|
"ShowCommand",
|
|
"Show information about installed packages.",
|
|
),
|
|
"check": CommandInfo(
|
|
- "pip._internal.commands.check",
|
|
+ "pipenv.patched.pip._internal.commands.check",
|
|
"CheckCommand",
|
|
"Verify installed packages have compatible dependencies.",
|
|
),
|
|
"config": CommandInfo(
|
|
- "pip._internal.commands.configuration",
|
|
+ "pipenv.patched.pip._internal.commands.configuration",
|
|
"ConfigurationCommand",
|
|
"Manage local and global configuration.",
|
|
),
|
|
"search": CommandInfo(
|
|
- "pip._internal.commands.search",
|
|
+ "pipenv.patched.pip._internal.commands.search",
|
|
"SearchCommand",
|
|
"Search PyPI for packages.",
|
|
),
|
|
"cache": CommandInfo(
|
|
- "pip._internal.commands.cache",
|
|
+ "pipenv.patched.pip._internal.commands.cache",
|
|
"CacheCommand",
|
|
"Inspect and manage pip's wheel cache.",
|
|
),
|
|
"index": CommandInfo(
|
|
- "pip._internal.commands.index",
|
|
+ "pipenv.patched.pip._internal.commands.index",
|
|
"IndexCommand",
|
|
"Inspect information available from package indexes.",
|
|
),
|
|
"wheel": CommandInfo(
|
|
- "pip._internal.commands.wheel",
|
|
+ "pipenv.patched.pip._internal.commands.wheel",
|
|
"WheelCommand",
|
|
"Build wheels from your requirements.",
|
|
),
|
|
"hash": CommandInfo(
|
|
- "pip._internal.commands.hash",
|
|
+ "pipenv.patched.pip._internal.commands.hash",
|
|
"HashCommand",
|
|
"Compute hashes of package archives.",
|
|
),
|
|
"completion": CommandInfo(
|
|
- "pip._internal.commands.completion",
|
|
+ "pipenv.patched.pip._internal.commands.completion",
|
|
"CompletionCommand",
|
|
"A helper command used for command completion.",
|
|
),
|
|
"debug": CommandInfo(
|
|
- "pip._internal.commands.debug",
|
|
+ "pipenv.patched.pip._internal.commands.debug",
|
|
"DebugCommand",
|
|
"Show information useful for debugging.",
|
|
),
|
|
"help": CommandInfo(
|
|
- "pip._internal.commands.help",
|
|
+ "pipenv.patched.pip._internal.commands.help",
|
|
"HelpCommand",
|
|
"Show help for commands.",
|
|
),
|
|
diff --git a/pipenv/patched/pip/_internal/req/req_install.py b/pipenv/patched/pip/_internal/req/req_install.py
|
|
index 1f479713a..a97401be4 100644
|
|
--- a/pipenv/patched/pip/_internal/req/req_install.py
|
|
+++ b/pipenv/patched/pip/_internal/req/req_install.py
|
|
@@ -514,6 +514,7 @@ class InstallRequirement:
|
|
self.unpacked_source_directory,
|
|
backend,
|
|
backend_path=backend_path,
|
|
+ python_executable=os.getenv('PIP_PYTHON_PATH', sys.executable)
|
|
)
|
|
|
|
def isolated_editable_sanity_check(self) -> None:
|
|
diff --git a/pipenv/patched/pip/_vendor/requests/packages.py b/pipenv/patched/pip/_vendor/requests/packages.py
|
|
index 9582fa730..720410ab5 100644
|
|
--- a/pipenv/patched/pip/_vendor/requests/packages.py
|
|
+++ b/pipenv/patched/pip/_vendor/requests/packages.py
|
|
@@ -4,13 +4,13 @@ import sys
|
|
# I don't like it either. Just look the other way. :)
|
|
|
|
for package in ('urllib3', 'idna', 'chardet'):
|
|
- vendored_package = "pip._vendor." + package
|
|
+ vendored_package = "pipenv.patched.pip._vendor." + package
|
|
locals()[package] = __import__(vendored_package)
|
|
# This traversal is apparently necessary such that the identities are
|
|
# preserved (requests.packages.urllib3.* is urllib3.*)
|
|
for mod in list(sys.modules):
|
|
if mod == vendored_package or mod.startswith(vendored_package + '.'):
|
|
- unprefixed_mod = mod[len("pip._vendor."):]
|
|
- sys.modules['pip._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod]
|
|
+ unprefixed_mod = mod[len("pipenv.patched.pip._vendor."):]
|
|
+ sys.modules['pipenv.patched.pip._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod]
|
|
|
|
# Kinda cool, though, right?
|