ci: Switch to Qt 5.15
This commit is contained in:
parent
deba727378
commit
f971cc041f
|
|
@ -10,8 +10,8 @@ image:
|
|||
|
||||
environment:
|
||||
PYTHONUNBUFFERED: 1
|
||||
PYTHON: C:\Python37-x64\python.exe
|
||||
TESTENV: py37-pyqt514
|
||||
PYTHON: C:\Python38-x64\python.exe
|
||||
TESTENV: py38-pyqt515
|
||||
|
||||
install:
|
||||
- '%PYTHON% --version'
|
||||
|
|
|
|||
20
.travis.yml
20
.travis.yml
|
|
@ -45,7 +45,6 @@ matrix:
|
|||
|
||||
### PyQt 5.12 (Python 3.8)
|
||||
- env: TESTENV=py38-pyqt512
|
||||
# http://code.qt.io/cgit/qt/qtbase.git/commit/?id=c3a963da1f9e7b1d37e63eedded61da4fbdaaf9a
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
|
|
@ -53,20 +52,31 @@ matrix:
|
|||
|
||||
### PyQt 5.13 (Python 3.8)
|
||||
- env: TESTENV=py38-pyqt513
|
||||
# http://code.qt.io/cgit/qt/qtbase.git/commit/?id=c3a963da1f9e7b1d37e63eedded61da4fbdaaf9a
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- libxkbcommon-x11-0
|
||||
|
||||
### PyQt 5.14 (Python 3.8, with coverage)
|
||||
- env: TESTENV=py38-pyqt514-cov
|
||||
# http://code.qt.io/cgit/qt/qtbase.git/commit/?id=c3a963da1f9e7b1d37e63eedded61da4fbdaaf9a
|
||||
### PyQt 5.14 (Python 3.8)
|
||||
- env: TESTENV=py38-pyqt514
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- libxkbcommon-x11-0
|
||||
|
||||
### PyQt 5.15 (Python 3.8, with coverage)
|
||||
- env: TESTENV=py38-pyqt515-cov
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- libxkbcommon-x11-0
|
||||
- libxcb-icccm4
|
||||
- libxcb-image0
|
||||
- libxcb-keysyms1
|
||||
- libxcb-randr0
|
||||
- libxcb-render-util0
|
||||
- libxcb-xinerama0
|
||||
|
||||
### macOS Mojave (10.14)
|
||||
- os: osx
|
||||
env: TESTENV=py37-pyqt514 OSX=mojave
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
# This file is automatically generated by scripts/dev/recompile_requirements.py
|
||||
|
||||
PyQt5==5.15.0 # rq.filter: < 6
|
||||
PyQt5-sip==12.8.0
|
||||
PyQtWebEngine==5.15.0 # rq.filter: < 6
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#@ filter: PyQt5 < 6
|
||||
#@ filter: PyQtWebEngine < 6
|
||||
PyQt5 >= 5.15, < 6
|
||||
PyQtWebEngine >= 5.15, < 6
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
# This file is automatically generated by scripts/dev/recompile_requirements.py
|
||||
|
||||
PyQt5==5.14.2
|
||||
PyQt5-sip==12.7.2
|
||||
PyQtWebEngine==5.14.0
|
||||
PyQt5==5.15.0
|
||||
PyQt5-sip==12.8.0
|
||||
PyQtWebEngine==5.15.0
|
||||
|
|
|
|||
7
tox.ini
7
tox.ini
|
|
@ -4,15 +4,15 @@
|
|||
# and then run "tox" from this directory.
|
||||
|
||||
[tox]
|
||||
envlist = py37-pyqt514-cov,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint
|
||||
envlist = py37-pyqt515-cov,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint
|
||||
distshare = {toxworkdir}
|
||||
skipsdist = true
|
||||
|
||||
[testenv]
|
||||
setenv =
|
||||
PYTEST_QT_API=pyqt5
|
||||
pyqt{,57,59,510,511,512,513,514}: LINK_PYQT_SKIP=true
|
||||
pyqt{,57,59,510,511,512,513,514}: QUTE_BDD_WEBENGINE=true
|
||||
pyqt{,57,59,510,511,512,513,514,515}: LINK_PYQT_SKIP=true
|
||||
pyqt{,57,59,510,511,512,513,514,515}: QUTE_BDD_WEBENGINE=true
|
||||
cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
|
||||
passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER QT_QUICK_BACKEND
|
||||
basepython =
|
||||
|
|
@ -32,6 +32,7 @@ deps =
|
|||
pyqt512: -r{toxinidir}/misc/requirements/requirements-pyqt-5.12.txt
|
||||
pyqt513: -r{toxinidir}/misc/requirements/requirements-pyqt-5.13.txt
|
||||
pyqt514: -r{toxinidir}/misc/requirements/requirements-pyqt-5.14.txt
|
||||
pyqt515: -r{toxinidir}/misc/requirements/requirements-pyqt-5.15.txt
|
||||
commands =
|
||||
{envpython} scripts/link_pyqt.py --tox {envdir}
|
||||
{envpython} -bb -m pytest {posargs:tests}
|
||||
|
|
|
|||
Loading…
Reference in New Issue