diff options
| author | Simo Fält <simo.falt@qt.io> | 2023-01-02 08:10:29 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-10 06:09:56 +0000 |
| commit | c3e721e54447136fb2fde821bf9063b50ebb6e6a (patch) | |
| tree | ce9e638cac7b5e3698947b334c87f462bba69c58 | |
| parent | 2277eb6214f41bf369b02efa4238e5036c23032e (diff) | |
Provisioning: Update default python3 version in win
Change amends 95e9f8da9ae84858e58af659735cc43d177af12e after new
version of win templates were introduced.
Change-Id: Idd370025201c66e3da5a3bde71573ad8461c4164
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit ab2ec09a76052c1f2bf983f74099067dc767013a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
4 files changed, 11 insertions, 13 deletions
diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/08-python3.ps1 index 71fa32bf..78598946 100644 --- a/coin/provisioning/qtci-windows-10_22H2-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/08-python3.ps1 @@ -6,9 +6,6 @@ # - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false . "$PSScriptRoot\..\common\windows\python3.ps1" 64 "3ee4e92a8ef94c70fb56859503fdc805d217d689" "C:\Python310_64" "3.10.0" - -. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1" -. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1" # default ones -. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bcf9bda733a9153811209c62d628c41ab6cedbe2" "C:\Python36" "3.6.2" $true -. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "cd9744b142eca832f9534390676e6cfb84bf655d" "C:\Python36_32" "3.6.2" $true +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1" $true +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1" $true diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/90-python-modules.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/90-python-modules.ps1 index 3646d826..80ab54dc 100644 --- a/coin/provisioning/qtci-windows-10_22H2-x86_64/90-python-modules.ps1 +++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/90-python-modules.ps1 @@ -1,3 +1,4 @@ +. "$PSScriptRoot\..\common\windows\helpers.ps1" # Needed by packaging scripts -C:\Python36\Scripts\pip3 install bs4 -C:\Python36\Scripts\pip3 install sh +$scriptsPath = [System.Environment]::GetEnvironmentVariable('PIP3_PATH', [System.EnvironmentVariableTarget]::Machine) +Run-Executable "$scriptsPath\pip3.exe" "install bs4" diff --git a/coin/provisioning/qtci-windows-11_22H2-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-11_22H2-x86_64/08-python3.ps1 index c621b2ee..7d52476a 100644 --- a/coin/provisioning/qtci-windows-11_22H2-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-11_22H2-x86_64/08-python3.ps1 @@ -5,9 +5,8 @@ # - version # - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false -. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1" -. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1" . "$PSScriptRoot\..\common\windows\python3.ps1" 64 "f8d42a421db25a01b53f0c135a9a74ddae042643" "C:\Python37_64" "3.7.9" +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "3ee4e92a8ef94c70fb56859503fdc805d217d689" "C:\Python310_64" "3.10.0" # default ones -. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bcf9bda733a9153811209c62d628c41ab6cedbe2" "C:\Python36" "3.6.2" $true -. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "cd9744b142eca832f9534390676e6cfb84bf655d" "C:\Python36_32" "3.6.2" $true +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1" $true +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1" $true diff --git a/coin/provisioning/qtci-windows-11_22H2-x86_64/90-python-modules.ps1 b/coin/provisioning/qtci-windows-11_22H2-x86_64/90-python-modules.ps1 index 3646d826..80ab54dc 100644 --- a/coin/provisioning/qtci-windows-11_22H2-x86_64/90-python-modules.ps1 +++ b/coin/provisioning/qtci-windows-11_22H2-x86_64/90-python-modules.ps1 @@ -1,3 +1,4 @@ +. "$PSScriptRoot\..\common\windows\helpers.ps1" # Needed by packaging scripts -C:\Python36\Scripts\pip3 install bs4 -C:\Python36\Scripts\pip3 install sh +$scriptsPath = [System.Environment]::GetEnvironmentVariable('PIP3_PATH', [System.EnvironmentVariableTarget]::Machine) +Run-Executable "$scriptsPath\pip3.exe" "install bs4" |