espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/tools_upgrade_pip_v5.0' into 'release/v5.0'

Browse Source 
Tools: Upgrade pip and setuptools if venv is not able (v5.0)

See merge request espressif/esp-idf!19521
This commit is contained in:
Roland Dobai
2022-08-12 21:51:09 +08:00
parent 6dd6ac57e8 a200091546
commit 452139ebc7
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/idf_tools.py
View File

@@ -1977,6 +1977,8 @@ def action_install_python_env(args): # type: ignore
warn('Removing the existing Python environment in {}'.format(idf_python_env_path)) warn('Removing the existing Python environment in {}'.format(idf_python_env_path))
shutil.rmtree(idf_python_env_path) shutil.rmtree(idf_python_env_path)
venv_can_upgrade = False
if not os.path.exists(virtualenv_python): if not os.path.exists(virtualenv_python):
try: try:
import venv # noqa: F401 import venv # noqa: F401
@@ -1986,6 +1988,7 @@ def action_install_python_env(args): # type: ignore
if sys.version_info[:2] >= (3, 9): if sys.version_info[:2] >= (3, 9):
# upgrade pip & setuptools # upgrade pip & setuptools
virtualenv_options += ['--upgrade-deps'] virtualenv_options += ['--upgrade-deps']
venv_can_upgrade = True
info('Creating a new Python environment in {}'.format(idf_python_env_path)) info('Creating a new Python environment in {}'.format(idf_python_env_path))
subprocess.check_call([sys.executable, '-m', 'venv', subprocess.check_call([sys.executable, '-m', 'venv',
@@ -2000,6 +2003,12 @@ def action_install_python_env(args): # type: ignore
if env_copy.get('PIP_USER') == 'yes': 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.') warn('Found PIP_USER="yes" in the environment. Disabling PIP_USER in this shell to install packages into a virtual environment.')
env_copy['PIP_USER'] = 'no' env_copy['PIP_USER'] = 'no'
if not venv_can_upgrade:
info('Upgrading pip and setuptools...')
subprocess.check_call([virtualenv_python, '-m', 'pip', 'install', '--upgrade', 'pip', 'setuptools'],
stdout=sys.stdout, stderr=sys.stderr, env=env_copy)
run_args = [virtualenv_python, '-m', 'pip', 'install', '--no-warn-script-location'] run_args = [virtualenv_python, '-m', 'pip', 'install', '--no-warn-script-location']
requirements_file_list = get_requirements(args.features) requirements_file_list = get_requirements(args.features)
for requirement_file in requirements_file_list: for requirement_file in requirements_file_list: