Skip to content

Commit ebed764

Browse files
committed
ci/travis: Add PyQt 5.14 to test matrix
Also remove most of install_pyqt.sh that deals with Qt4 support
1 parent 18ba961 commit ebed764

File tree

2 files changed

+9
-42
lines changed

2 files changed

+9
-42
lines changed

.travis.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ addons:
1010
packages:
1111
- libxkbcommon-x11-0 # for PyQt 5.12
1212

13+
env:
14+
global:
15+
- PYQT_DEPS="PyQt5~=5.12.0 PyQtWebengine~=5.12.0"
16+
1317
matrix:
1418
include:
1519
- env: RUN_PYLINT=true
@@ -19,8 +23,11 @@ matrix:
1923
python: '3.6'
2024
script: source $TRAVIS_BUILD_DIR/.travis/build_doc.sh
2125
- python: '3.6'
22-
env: UPLOAD_COVERAGE=true
26+
env:
27+
- UPLOAD_COVERAGE=true
2328
- python: '3.7'
29+
env:
30+
- PYQT_DEPS="PyQt5~=5.14.0 PyQtWebengine~=5.14.0"
2431
fast_finish: true
2532

2633
cache:

.travis/install_pyqt.sh

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1 @@
1-
if [ ! "$PYQT4" ]; then
2-
foldable pip install sip 'pyqt5!=5.10,<5.14' # 5.10 exhibits QTBUG-65235
3-
# PyQt >= 5.12 distributes WebEngine separately
4-
foldable pip install 'pyqtwebengine<5.14'
5-
return $?;
6-
fi
7-
8-
9-
PYQT=$TRAVIS_BUILD_DIR/pyqt
10-
11-
SIP_VERSION=4.16.9
12-
PYQT_VERSION=4.11.4
13-
14-
if [ ! "$(ls $PYQT)" ]; then
15-
mkdir -p $PYQT
16-
cd $PYQT
17-
18-
wget -O sip.tar.gz http://sourceforge.net/projects/pyqt/files/sip/sip-$SIP_VERSION/sip-$SIP_VERSION.tar.gz
19-
mkdir -p sip
20-
tar xzf sip.tar.gz -C sip --strip-component=1
21-
22-
wget -O PyQt.tar.gz http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-$PYQT_VERSION/PyQt-x11-gpl-$PYQT_VERSION.tar.gz
23-
mkdir -p PyQt
24-
tar xzf PyQt.tar.gz -C PyQt --strip-components=1
25-
26-
cd $PYQT/sip
27-
python configure.py -e $PYQT/include
28-
make
29-
make install
30-
31-
cd $PYQT/PyQt
32-
pwd
33-
python configure.py --confirm-license --no-designer-plugin
34-
make
35-
fi
36-
37-
cd $PYQT/sip
38-
make install
39-
40-
cd $PYQT/PyQt
41-
make install
1+
foldable pip install ${PYQT_DEPS}

0 commit comments

Comments
 (0)