traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-38927: Use python -m pip to upgrade venv deps (GH-17403) 

I suggest you add `bpo-NNNNN: ` as a prefix for the first commit for future PRs. Thanks!
This commit is contained in:
Tzu-ping Chung 2019-11-28 04:25:23 +08:00 committed by Vinay Sajip
parent 045d4e243d
commit d9aa216d49
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_venv.py
View File

@ -141,16 +141,18 @@ class BasicTest(BaseTest):
def test_upgrade_dependencies(self):
builder = venv.EnvBuilder()
bin_path = 'Scripts' if sys.platform == 'win32' else 'bin'
pip_exe = 'pip.exe' if sys.platform == 'win32' else 'pip'
python_exe = 'python.exe' if sys.platform == 'win32' else 'python'
with tempfile.TemporaryDirectory() as fake_env_dir:
def pip_cmd_checker(cmd):
self.assertEqual(
cmd,
[
os.path.join(fake_env_dir, bin_path, pip_exe),
os.path.join(fake_env_dir, bin_path, python_exe),
'-m',
'pip',
'install',
'-U',
'--upgrade',
'pip',
'setuptools'
]

6
Lib/venv/__init__.py
View File

@ -393,10 +393,10 @@ class EnvBuilder:
f'Upgrading {CORE_VENV_DEPS} packages in {context.bin_path}'
)
if sys.platform == 'win32':
pip_exe = os.path.join(context.bin_path, 'pip.exe')
python_exe = os.path.join(context.bin_path, 'python.exe')
else:
pip_exe = os.path.join(context.bin_path, 'pip')
cmd = [pip_exe, 'install', '-U']
python_exe = os.path.join(context.bin_path, 'python')
cmd = [python_exe, '-m', 'pip', 'install', '--upgrade']
cmd.extend(CORE_VENV_DEPS)
subprocess.check_call(cmd)

1
Misc/NEWS.d/next/Library/2019-11-27-17-47-00.bpo-38927.qT7xKY.rst Normal file
View File

@ -0,0 +1 @@
Use ``python -m pip`` instead of ``pip`` to upgrade dependencies in venv.