mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'fix/virtualenv_dir_v4.2' into 'release/v4.2'
Tools: Keep making virtual environments with python in the bin directory (v4.2) See merge request espressif/esp-idf!20621
This commit is contained in:
commit
b89f55d74a
@ -1393,8 +1393,15 @@ def action_install_python_env(args): # type: ignore
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--user', 'virtualenv'],
|
||||
stdout=sys.stdout, stderr=sys.stderr)
|
||||
|
||||
env_copy = os.environ.copy()
|
||||
# Virtualenv with setuptools>=60 produces on recent Debian/Ubuntu systems virtual environments with
|
||||
# local/bin/python paths. SETUPTOOLS_USE_DISTUTILS=stdlib is a workaround to keep bin/python paths.
|
||||
# See https://github.com/pypa/setuptools/issues/3278 for more information.
|
||||
env_copy['SETUPTOOLS_USE_DISTUTILS'] = 'stdlib'
|
||||
subprocess.check_call([sys.executable, '-m', 'virtualenv', '--seeder', 'pip', idf_python_env_path],
|
||||
stdout=sys.stdout, stderr=sys.stderr)
|
||||
stdout=sys.stdout, stderr=sys.stderr,
|
||||
env=env_copy)
|
||||
|
||||
env_copy = os.environ.copy()
|
||||
if env_copy.get('PIP_USER') == 'yes':
|
||||
warn('Found PIP_USER="yes" in the environment. Disabling PIP_USER in this shell to install packages into a virtual environment.')
|
||||
|
Loading…
x
Reference in New Issue
Block a user