Close #19694: venv now runs ensurepip in isolated mode

This commit is contained in:
Nick Coghlan 2013-11-23 11:37:28 +10:00
parent fd66cc5534
commit d76cdc161e
2 changed files with 12 additions and 4 deletions

View File

@ -12,7 +12,7 @@ import subprocess
import sys
import tempfile
from test.support import (captured_stdout, captured_stderr, run_unittest,
can_symlink)
can_symlink, EnvironmentVarGuard)
import unittest
import venv
@ -280,7 +280,12 @@ class EnsurePipTest(BaseTest):
def test_with_pip(self):
shutil.rmtree(self.env_dir)
self.run_with_capture(venv.create, self.env_dir, with_pip=True)
with EnvironmentVarGuard() as envvars:
# pip's cross-version compatibility may trigger deprecation
# warnings in current versions of Python. Ensure related
# environment settings don't cause venv to fail.
envvars["PYTHONWARNINGS"] = "e"
self.run_with_capture(venv.create, self.env_dir, with_pip=True)
envpy = os.path.join(os.path.realpath(self.env_dir), self.bindir, self.exe)
cmd = [envpy, '-m', 'pip', '--version']
p = subprocess.Popen(cmd, stdout=subprocess.PIPE,

View File

@ -234,8 +234,11 @@ class EnvBuilder:
def _setup_pip(self, context):
"""Installs or upgrades pip in a virtual environment"""
cmd = [context.env_exe, '-m', 'ensurepip', '--upgrade',
'--default-pip']
# We run ensurepip in isolated mode to avoid side effects from
# environment vars, the current directory and anything else
# intended for the global Python environment
cmd = [context.env_exe, '-Im', 'ensurepip', '--upgrade',
'--default-pip']
subprocess.check_output(cmd)
def setup_scripts(self, context):