From ef4fcb8ac7aa89e47f9028afad4e1e79a0c7bd28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 7 Dec 2021 13:55:54 +0200 Subject: [PATCH] Provisioning: Set Python 3.9 as a default on Arm macs The default intepreter under Frameworks is not working properly for all CI use cases. Change-Id: If665ea9ad81afa510c00162021ba7b143855cbd7 Reviewed-by: Dominik Holland Reviewed-by: Ville-Pekka Karhu --- coin/provisioning/qtci-macos-11.0-arm/25-python3.sh | 2 ++ coin/provisioning/qtci-macos-12.0-arm/25-python3.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/coin/provisioning/qtci-macos-11.0-arm/25-python3.sh b/coin/provisioning/qtci-macos-11.0-arm/25-python3.sh index 7adafe4d..a18bd39a 100755 --- a/coin/provisioning/qtci-macos-11.0-arm/25-python3.sh +++ b/coin/provisioning/qtci-macos-11.0-arm/25-python3.sh @@ -47,6 +47,8 @@ pyenv install 3.9.7 SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" +# Use 3.9 as a default python +SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH" # Install all needed packages in a special wheel cache directory /Users/qt/.pyenv/versions/3.9.7/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt diff --git a/coin/provisioning/qtci-macos-12.0-arm/25-python3.sh b/coin/provisioning/qtci-macos-12.0-arm/25-python3.sh index 7adafe4d..a18bd39a 100755 --- a/coin/provisioning/qtci-macos-12.0-arm/25-python3.sh +++ b/coin/provisioning/qtci-macos-12.0-arm/25-python3.sh @@ -47,6 +47,8 @@ pyenv install 3.9.7 SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" +# Use 3.9 as a default python +SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH" # Install all needed packages in a special wheel cache directory /Users/qt/.pyenv/versions/3.9.7/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt