Merge branch 'qt510-2'

This commit is contained in:
Florian Bruhin 2018-02-07 11:48:39 +01:00
commit 29e8c01d17
2 changed files with 12 additions and 1 deletions

View File

@ -7,7 +7,7 @@ environment:
PYTHONUNBUFFERED: 1
PYTHON: C:\Python36\python.exe
matrix:
- TESTENV: py36-pyqt59
- TESTENV: py36-pyqt510
- TESTENV: pylint
install:

View File

@ -21,6 +21,17 @@ matrix:
env: TESTENV=py35-pyqt59
- os: linux
env: TESTENV=py36-pyqt59-cov
- os: linux
env: TESTENV=py36-pyqt510
# We need a newer Xvfb as a WORKAROUND for:
# https://bugreports.qt.io/browse/QTBUG-64928
sudo: required
addons:
apt:
sources:
- sourceline: "deb http://us.archive.ubuntu.com/ubuntu/ xenial main universe"
packages:
- xvfb
- os: osx
env: TESTENV=py36 OSX=sierra
osx_image: xcode9.2