aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-linux-RHEL-7.4-x86_64
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2018-08-29 14:49:39 +0200
committerLiang Qi <liang.qi@qt.io>2018-09-05 05:53:59 +0000
commit7fe274f6f6944838c42231d3ec77b22527594a07 (patch)
tree7d0fb8a023f90edb214d84c2a0241a6d96fbfd43 /coin/provisioning/qtci-linux-RHEL-7.4-x86_64
parentdb7391647f85c23297527c0efc8d83bea29004ca (diff)
Correctly use pip3 to setup a wheel cache for python3 packages on linux
Previously pip was used (instead of pip3) which caused that python2 packages were installed into the python3 wheel cache folder. Some of the packages also worked for python3, but not all of them. Task-number: AUTOSUITE-195 Change-Id: I393d036667b14e11dee65975ba6933e7174d0e9d Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-7.4-x86_64')
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh3
1 files changed, 2 insertions, 1 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 444765bf..4e2799ff 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
@@ -108,8 +108,9 @@ sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3
sudo pip install --upgrade pip
sudo pip install virtualenv wheel
+sudo /usr/local/bin/pip3 install wheel
# Install all needed packages in a special wheel cache directory
-pip wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
+/usr/local/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"