diff options
| author | Simo Fält <simo.falt@qt.io> | 2018-03-22 16:04:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-18 18:16:06 +0000 |
| commit | b74a5ac5331292480eccf1894574534153e5c300 (patch) | |
| tree | d89666ac30b71168ce95c6f092c8f9572ce7c02c | |
| parent | 6f39655317d4bca4962c6a2639210dcc975e5f55 (diff) | |
Revert "Install Python 2.7.13 to RHEL with pip"
This reverts commit 794913dde77e9a2918353894a33d03b16e6927c4,
which seems to break pyside builds. Instead we install python-pip
package from the EPEL repository.
Change-Id: Ic84680b0b0d6950d389bb42a6add18c83256f00f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 6a06c4b4fe7fad6595252ac035fc0c05627b62c6)
Reviewed-by: Simo Fält <simo.falt@qt.io>
| -rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 11 |
1 files changed, 6 insertions, 5 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 fe3f70fb..9fcb7605 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 @@ -63,8 +63,8 @@ installPackages+=(gtk3-devel) installPackages+=(libusbx-devel) # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux installPackages+=(speech-dispatcher-devel) -# Python 2.7 with python-devel, pip and virtualenv -installPackages+=(python27) +# Python 2 devel and pip. python-pip requires the EPEL repository to be added +installPackages+=(python-devel python-pip) # Python 3 with python-devel, pip and virtualenv installPackages+=(rh-python36) # WebEngine @@ -87,8 +87,9 @@ installPackages+=(bluez-libs-devel) sudo yum -y install "${installPackages[@]}" -# Make python 2.7 and its pip default -echo "source scl_source enable python27" >> ~/.bashrc - 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 virtualenv |