summaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@qt.io>2018-03-19 12:38:45 +0100
committerTony Sarajärvi <tony.sarajarvi@qt.io>2018-03-22 06:05:26 +0000
commit9ae91ae3f87fb3e3ad030410c4d313cb217f530b (patch)
tree96071a78578b49ff76af49d512112e3408d048f2 /coin
parent418cb4c4f5b199b8a9ed71752f70c711882ad42f (diff)
Update Python 3.4 to 3.6 in RHEL 7.x
Also install Python 3 through system packages instead of some weird scripts. Change-Id: Ie22e126a422bd6efe9b3030d5044f4c196894ca8 Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'coin')
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh5
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh54
2 files changed, 5 insertions, 54 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 7c595e3a..710ac87d 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
@@ -66,6 +66,8 @@ installPackages+=(libusbx-devel)
installPackages+=(speech-dispatcher-devel)
# Python
installPackages+=(python-devel python-virtualenv)
+# Python 3 with python-devel, pip and virtualenv
+installPackages+=(rh-python36)
# WebEngine
installPackages+=(bison)
installPackages+=(flex)
@@ -91,3 +93,6 @@ installPackages+=(libffi-devel)
sudo yum -y update
sudo yum -y install "${installPackages[@]}"
+
+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
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh
deleted file mode 100755
index 4e75633d..00000000
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-set -ex
-
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-
-# install python3
-sudo yum install -y python34-devel
-
-# install pip3
-
-packagePip="get-pip.py"
-OfficialUrlPip="https://bootstrap.pypa.io/$packagePip"
-CachedUrlPip="http://ci-files01-hki.intra.qt.io/input/redhat/$packagePip"
-SHA1Pip="3d45cef22b043b2b333baa63abaa99544e9c031d"
-
-DownloadURL $CachedUrlPip $OfficialUrlPip $SHA1Pip ./$packagePip
-sudo python3 $packagePip
-sudo rm -f $packagePip
-sudo pip3 install virtualenv
-