Merge branch 'bug/revert_propagate_esp_python' into 'master'

Revert "feat(tools): use ESP_PYTHON during install"

See merge request espressif/esp-idf!24945
This commit is contained in:
Roland Dobai
2023-07-21 18:12:31 +08:00
2 changed files with 4 additions and 6 deletions

View File

@@ -5,10 +5,9 @@
set OLDEST_PYTHON_SUPPORTED_MAJOR 3 set OLDEST_PYTHON_SUPPORTED_MAJOR 3
set OLDEST_PYTHON_SUPPORTED_MINOR 7 set OLDEST_PYTHON_SUPPORTED_MINOR 7
set -q ESP_PYTHON; or set PYLIST python3 python python3.7 python3.8 python3.9 python3.10 python3.11 python3.12 set -x ESP_PYTHON python
set -q ESP_PYTHON; or set -x ESP_PYTHON python
for p_cmd in $PYLIST; for p_cmd in python3 python python3.7 python3.8 python3.9 python3.10 python3.11 python3.12;
$p_cmd --version >/dev/null 2>&1; or continue $p_cmd --version >/dev/null 2>&1; or continue
echo "Checking \"$p_cmd\" ..." echo "Checking \"$p_cmd\" ..."

View File

@@ -10,10 +10,9 @@
OLDEST_PYTHON_SUPPORTED_MAJOR=3 OLDEST_PYTHON_SUPPORTED_MAJOR=3
OLDEST_PYTHON_SUPPORTED_MINOR=7 OLDEST_PYTHON_SUPPORTED_MINOR=7
PYLIST=${ESP_PYTHON:-python3 python python3.7 python3.8 python3.9 python3.10 python3.11 python3.12} ESP_PYTHON=python
ESP_PYTHON=${ESP_PYTHON:-python}
for p_cmd in $PYLIST; do for p_cmd in python3 python python3.7 python3.8 python3.9 python3.10 python3.11 python3.12; do
$p_cmd --version >/dev/null 2>&1 || continue $p_cmd --version >/dev/null 2>&1 || continue
echo "Checking \"$p_cmd\" ..." echo "Checking \"$p_cmd\" ..."