fix(idf_tools.py): Upgrade pip and setuptools separately

This way the setuptools version dependency resolution will be done by
the upgraded pip.
This commit is contained in:
Roland Dobai 2024-12-18 11:27:00 +01:00
parent 94f3007db0
commit 4450952227

View File

@ -2084,8 +2084,14 @@ def action_install_python_env(args): # type: ignore
constraint_file = get_constraints(idf_version) if use_constraints else None constraint_file = get_constraints(idf_version) if use_constraints else None
info('Upgrading pip and setuptools...') info('Upgrading pip...')
run_args = [virtualenv_python, '-m', 'pip', 'install', '--upgrade', 'pip', 'setuptools'] run_args = [virtualenv_python, '-m', 'pip', 'install', '--upgrade', 'pip']
if constraint_file:
run_args += ['--constraint', constraint_file]
subprocess.check_call(run_args, stdout=sys.stdout, stderr=sys.stderr, env=env_copy)
info('Upgrading setuptools...')
run_args = [virtualenv_python, '-m', 'pip', 'install', '--upgrade', 'setuptools']
if constraint_file: if constraint_file:
run_args += ['--constraint', constraint_file] run_args += ['--constraint', constraint_file]
subprocess.check_call(run_args, stdout=sys.stdout, stderr=sys.stderr, env=env_copy) subprocess.check_call(run_args, stdout=sys.stdout, stderr=sys.stderr, env=env_copy)