aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2021-02-02 12:22:23 +0200
committerJukka Jokiniva <jukka.jokiniva@qt.io>2021-02-12 17:10:29 +0000
commit92ea8f4884c429c2198a64327c48039ebdd166e0 (patch)
treedb5b618f5539e5ad5f174dc008579b7cf579cb32
parentd94fd443b64e221728248795339a0c6af0863ce5 (diff)
Provisioning: Latest pip versions don't support Python 2 anymore
We can't upgrade pip anymore to the latest version. pip 20.3 was the last version of pip that supported Python 2 Task-number: QTQAINFRA-4235 Change-Id: I2add6939614f282416a39b00734bc1d22906de47 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit d6e3aa0869e5a7ed1db843dd6c798ab39fa3992e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 17c654f6001a36e9f51d430eaec82975dfe82f9e) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
index b956d6a3..e0810b74 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
@@ -2,7 +2,7 @@
#############################################################################
##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -122,7 +122,7 @@ sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3
sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3
# We shouldn't use yum to install virtualenv. The one found from package repo is not
# working, but we can use installed pip
-sudo pip install --upgrade pip
+sudo pip install --upgrade "pip < 21.0"
sudo pip install virtualenv wheel
sudo /usr/local/bin/pip3 install wheel