From 7339218edd6c91688c2eac8c41be1d72950f7def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 5 Dec 2019 15:05:20 +0200 Subject: Provisioning: Install Python 3.8 for testing Qt for Python This installs Python 3.8.1 to be used with Qt for Python. It keeps the old 3.6 as a default python3. Change-Id: I8ea121514f6a4092f700688363c282cbea37a75b Reviewed-by: Toni Saario (cherry picked from commit 607b33aab2477f49eeb08b780ff9962d4e4f2a04) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 | 1 - coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 | 13 ++++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86_64') diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 deleted file mode 100644 index 5ffeab3b..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "C:\Python36_32" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 index 3201032d..0ab0ed39 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 @@ -1 +1,12 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" 64 +# Parameters: +# - Arch 32/64 +# - installer sha1 +# - install target dir +# - 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" +# default ones +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bf54252c4065b20f4a111cc39cf5215fb1edccff" "C:\Python36" "3.6.1" $true +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "76c50b747237a0974126dd8b32ea036dd77b2ad1" "C:\Python36_32" "3.6.1" $true -- cgit v1.2.3