diff options
| author | Simo Fält <simo.falt@qt.io> | 2019-12-05 15:05:20 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2020-07-17 10:35:58 +0300 |
| commit | 7339218edd6c91688c2eac8c41be1d72950f7def (patch) | |
| tree | 515e11ca57d88e6938aae5a4ed8a8145f47cba10 /coin/provisioning/qtci-windows-10-x86_64 | |
| parent | 73765a68851ca2cb23b99471d2082efe722d8d5d (diff) | |
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 <toni.saario@qt.io>
(cherry picked from commit 607b33aab2477f49eeb08b780ff9962d4e4f2a04)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 | 1 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 | 13 |
2 files changed, 12 insertions, 2 deletions
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 |