Tools: Keep making virtual environments with python in the bin directory

On Ubuntu 22.04 virtualenv with the latest setuptools produces
environments with Python in "local/bin" instead of "bin" (see
https://github.com/pypa/virtualenv/issues/2350).

Closes https://github.com/espressif/esp-idf/issues/9931
This commit is contained in:
Roland Dobai 2022-10-13 13:54:50 +02:00
parent 6e42e604b2
commit 158df60dce

View File

@ -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.')