From 528580bbcd2a2cd432a22efd6a7209c56c4fbb3e Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Tue, 2 May 2017 11:34:30 +0200 Subject: Install python3 on all platforms This forward-ports commit a99d3432f71c4be5045ae2cdcc3b7070de5abe23 to 5.9, which should have been done in 6bf5691ca87dd4dcf9386a4c6320be2c39db6dcb but accidentally left out. It reuses parts of commit a5f3f8ed482d314d092e1a6ddc5568839bb59c74 that was initially cherry-picked to 5.6. Task-number: QTAUTO-345 Task-number: QTBUG-63133 Change-Id: Ib401dd06bfc4d4aaf8b8ce1a8509697993d4397e Reviewed-by: Simon Hausmann --- .../qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh | 15 ++++++++++++++- .../qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 2 ++ .../qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 8 ++++++++ coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh | 1 + 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh create mode 100644 coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh (limited to 'coin') diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh index ad1bf18f..ff25f463 100644 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh @@ -1,5 +1,18 @@ # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside -sudo subscription-manager refresh sudo yum install -y python-devel python-virtualenv + +# install the EPEL repository which provides python3 +wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm +sudo rpm -Uvh epel-release-latest-7.noarch.rpm +sudo rm -f epel-release-latest-7.noarch.rpm + +# install python3 +sudo yum install -y python34-devel + +# install pip3 +wget https://bootstrap.pypa.io/get-pip.py +sudo python3 get-pip.py +sudo rm -f get-pip.py +sudo pip3 install virtualenv diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh index 593b7c5b..f07be55a 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh @@ -82,6 +82,8 @@ try sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT # Support for cross-building to x86 (needed by WebEngine boot2qt builds) sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT + # python3 development package + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT ) catch || { case $ex_code in diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh new file mode 100644 index 00000000..254b738d --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -0,0 +1,8 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo pkcon -y refresh +sudo pkcon -y install python-devel python-virtualenv + +# install python3 +sudo pkcon -y install python3 python3-pip python3-virtualenv diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" -- cgit v1.2.3