Skip to content

Commit 841db91

Browse files
committed
Update to pip-run 6.2
1 parent c0aa401 commit 841db91

File tree

2 files changed

+2
-31
lines changed

2 files changed

+2
-31
lines changed

src/pip/_vendor/pip_run/deps.py

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -48,42 +48,13 @@ def _installable(args):
4848
def load(*args):
4949
target = tempfile.mkdtemp(prefix='pip-run-')
5050
cmd = (sys.executable, '-m', 'pip', 'install', '-t', target) + args
51-
with _patch_prefix():
52-
_installable(args) and subprocess.check_call(cmd)
51+
_installable(args) and subprocess.check_call(cmd)
5352
try:
5453
yield target
5554
finally:
5655
shutil.rmtree(target)
5756

5857

59-
def _needs_pip_4106_workaround():
60-
"""
61-
Detect if the environment is configured with a prefix, as
62-
the workaround is only required under those conditions.
63-
"""
64-
import distutils.dist
65-
66-
dist = distutils.dist.Distribution()
67-
dist.parse_config_files()
68-
return 'prefix' in dist.get_option_dict('install')
69-
70-
71-
@contextlib.contextmanager
72-
def _patch_prefix():
73-
"""
74-
To workaround pypa/pip#4106, override the system prefix with
75-
a user prefix, restoring the original file after.
76-
"""
77-
if not _needs_pip_4106_workaround():
78-
yield
79-
return
80-
cfg_fn = os.path.expanduser('~/.pydistutils.cfg')
81-
with _save_file(cfg_fn):
82-
with open(cfg_fn, 'w') as cfg:
83-
cfg.write('[install]\nprefix=\n')
84-
yield
85-
86-
8758
@contextlib.contextmanager
8859
def _save_file(filename):
8960
"""

src/pip/_vendor/vendor.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ipaddress==1.0.23 # Only needed on 2.6 and 2.7
99
msgpack==0.6.2
1010
packaging==20.1
1111
pep517==0.7.0
12-
pip-run==6.1
12+
pip-run==6.2
1313
progress==1.5
1414
pyparsing==2.4.6
1515
pytoml==0.1.21

0 commit comments

Comments
 (0)