Skip to content

Commit

Permalink
ci/travis: Add PyQt 5.14 to test matrix
Browse files Browse the repository at this point in the history
Also remove most of install_pyqt.sh that deals with Qt4 support
  • Loading branch information
ales-erjavec committed Feb 12, 2020
1 parent d6feaab commit ce74a81
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 42 deletions.
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ addons:
packages:
- libxkbcommon-x11-0 # for PyQt 5.12

env:
global:
- PYQT_DEPS="PyQt5~=5.12.0 PyQtWebengine~=5.12.0"

matrix:
include:
- env: RUN_PYLINT=true
Expand All @@ -19,8 +23,11 @@ matrix:
python: '3.6'
script: source $TRAVIS_BUILD_DIR/.travis/build_doc.sh
- python: '3.6'
env: UPLOAD_COVERAGE=true
env:
- UPLOAD_COVERAGE=true
- python: '3.7'
env:
- PYQT_DEPS="PyQt5~=5.14.0 PyQtWebengine~=5.14.0"
fast_finish: true

cache:
Expand Down
42 changes: 1 addition & 41 deletions .travis/install_pyqt.sh
Original file line number Diff line number Diff line change
@@ -1,41 +1 @@
if [ ! "$PYQT4" ]; then
foldable pip install sip 'pyqt5!=5.10,<5.14' # 5.10 exhibits QTBUG-65235
# PyQt >= 5.12 distributes WebEngine separately
foldable pip install 'pyqtwebengine<5.14'
return $?;
fi


PYQT=$TRAVIS_BUILD_DIR/pyqt

SIP_VERSION=4.16.9
PYQT_VERSION=4.11.4

if [ ! "$(ls $PYQT)" ]; then
mkdir -p $PYQT
cd $PYQT

wget -O sip.tar.gz http://sourceforge.net/projects/pyqt/files/sip/sip-$SIP_VERSION/sip-$SIP_VERSION.tar.gz
mkdir -p sip
tar xzf sip.tar.gz -C sip --strip-component=1

wget -O PyQt.tar.gz http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-$PYQT_VERSION/PyQt-x11-gpl-$PYQT_VERSION.tar.gz
mkdir -p PyQt
tar xzf PyQt.tar.gz -C PyQt --strip-components=1

cd $PYQT/sip
python configure.py -e $PYQT/include
make
make install

cd $PYQT/PyQt
pwd
python configure.py --confirm-license --no-designer-plugin
make
fi

cd $PYQT/sip
make install

cd $PYQT/PyQt
make install
foldable pip install ${PYQT_DEPS}

0 comments on commit ce74a81

Please sign in to comment.