feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'fix/virtualenv_dir_v4.3' into 'release/v4.3'

Browse Source 
Tools: Keep making virtual environments with python in the bin directory (v4.3)

See merge request espressif/esp-idf!20620
This commit is contained in:
Roland Dobai
2022-10-17 01:04:34 +08:00
parent bc4de7dc29 71598bf4f9
commit feeca500de
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/idf_tools.py
View File

@@ -1539,10 +1539,17 @@ def action_install_python_env(args): # type: ignore
if with_seeder_option:
virtualenv_options += ['--seeder', 'pip']
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'] +
virtualenv_options +
[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.')