espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 11:17:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/honor_idf_python_env_path_v5.4' into 'release/v5.4'

Browse Source 
fix(tools): honor IDF_PYTHON_ENV_PATH value (v5.4)

See merge request espressif/esp-idf!35873
This commit is contained in:
Roland Dobai
2025-01-06 15:39:24 +08:00
parent 58137e67b2 a87fe7aa3a
commit 1e788836a5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/activate.py
View File

@ -29,7 +29,6 @@ except ImportError as e:
# Get ESP-IDF venv python path # Get ESP-IDF venv python path
idf_tools.g.idf_path = idf_path idf_tools.g.idf_path = idf_path
os.environ['IDF_PYTHON_ENV_PATH'] = '' # let idf_tools get the pyenv path
idf_tools.g.idf_tools_path = os.environ.get('IDF_TOOLS_PATH') or os.path.expanduser(idf_tools.IDF_TOOLS_PATH_DEFAULT) idf_tools.g.idf_tools_path = os.environ.get('IDF_TOOLS_PATH') or os.path.expanduser(idf_tools.IDF_TOOLS_PATH_DEFAULT)
idf_python_env_path, idf_python_export_path, virtualenv_python, idf_version = idf_tools.get_python_env_path() idf_python_env_path, idf_python_export_path, virtualenv_python, idf_version = idf_tools.get_python_env_path()
@ -39,7 +38,9 @@ os.environ['IDF_PYTHON_ENV_PATH'] = idf_python_env_path
os.environ['ESP_IDF_VERSION'] = idf_version os.environ['ESP_IDF_VERSION'] = idf_version
if not os.path.exists(virtualenv_python): if not os.path.exists(virtualenv_python):
die(f'ESP-IDF Python virtual environment not found. Please run the install script to set it up before proceeding.') die((f'ESP-IDF Python virtual environment "{virtualenv_python}" '
f'not found. Please run the install script to set it up before '
f'proceeding.'))
try: try:
run([virtualenv_python, os.path.join(idf_path, 'tools', 'export_utils', 'activate_venv.py')] + sys.argv[1:], check=True) run([virtualenv_python, os.path.join(idf_path, 'tools', 'export_utils', 'activate_venv.py')] + sys.argv[1:], check=True)