From 95e9f8da9ae84858e58af659735cc43d177af12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 3 Nov 2022 11:57:47 +0200 Subject: [PATCH] Provisioning: Update default python3 version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removing python3.6 and replacing it with more recent versions. Pick-to: 6.4 6.5 Change-Id: If8cd4c369e4fc9ff8dc7d53865b80b588f278091 Reviewed-by: Tony Sarajärvi Reviewed-by: Jukka Jokiniva --- coin/provisioning/common/windows/conan.ps1 | 2 +- .../qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh | 3 --- .../qtci-windows-10_21H2-x86_64/08-python3.ps1 | 7 ++----- .../qtci-windows-10_21H2-x86_64/90-python-modules.ps1 | 5 +++-- .../qtci-windows-11_21H2-x86_64/08-python3.ps1 | 7 +++---- .../qtci-windows-11_21H2-x86_64/90-python-modules.ps1 | 5 +++-- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index 50b731a0..17623829 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -39,7 +39,7 @@ . "$PSScriptRoot\helpers.ps1" -$scriptsPath = "C:\Python36\Scripts" +$scriptsPath = [System.Environment]::GetEnvironmentVariable('PIP3_PATH', [System.EnvironmentVariableTarget]::Machine) $version = "1.39.0" Run-Executable "$scriptsPath\pip3.exe" "install conan==$version" Write-Output "Conan = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh index c37c5a7d..4f548101 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh @@ -86,9 +86,6 @@ installPackages+=(libusbx-devel) installPackages+=(speech-dispatcher-devel) # Python 2 devel and pip. python-pip requires the EPEL repository to be added installPackages+=(python2-devel python2-pip) -# Python 3 with python-devel, pip and virtualenv -installPackages+=(python36) -installPackages+=(python36-devel) # WebEngine installPackages+=(bison) installPackages+=(flex) diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/08-python3.ps1 index 71fa32bf..78598946 100644 --- a/coin/provisioning/qtci-windows-10_21H2-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10_21H2-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_21H2-x86_64/90-python-modules.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/90-python-modules.ps1 index 3646d826..80ab54dc 100644 --- a/coin/provisioning/qtci-windows-10_21H2-x86_64/90-python-modules.ps1 +++ b/coin/provisioning/qtci-windows-10_21H2-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_21H2-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/08-python3.ps1 index c621b2ee..7d52476a 100644 --- a/coin/provisioning/qtci-windows-11_21H2-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-11_21H2-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_21H2-x86_64/90-python-modules.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/90-python-modules.ps1 index 3646d826..80ab54dc 100644 --- a/coin/provisioning/qtci-windows-11_21H2-x86_64/90-python-modules.ps1 +++ b/coin/provisioning/qtci-windows-11_21H2-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"