Use separate requirements files for different Qt versions

This commit is contained in:
Florian Bruhin 2019-07-16 11:08:47 +02:00
parent 326a9a8a79
commit 17c02cbddd
14 changed files with 52 additions and 14 deletions

View File

@ -17,10 +17,10 @@ matrix:
### PyQt 5.7.1 (Python 3.5)
- python: 3.5
env: TESTENV=py35-pyqt571
env: TESTENV=py35-pyqt57
### PyQt 5.7.1 (Python 3.6)
- python: 3.6
env: TESTENV=py36-pyqt571
env: TESTENV=py36-pyqt57
### PyQt 5.9
- env: TESTENV=py37-pyqt59

View File

@ -0,0 +1,4 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
PyQt5==5.9.2 # rq.filter: < 5.10
sip==4.19.8

View File

@ -0,0 +1,2 @@
#@ filter: PyQt5 < 5.10
PyQt5 >= 5.9, < 5.10

View File

@ -0,0 +1,4 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
PyQt5==5.11.3 # rq.filter: < 5.12
PyQt5-sip==4.19.18

View File

@ -0,0 +1,2 @@
#@ filter: PyQt5 < 5.12
PyQt5 >= 5.11, < 5.12

View File

@ -0,0 +1,5 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
PyQt5==5.12.3 # rq.filter: < 5.13
PyQt5-sip==4.19.18
PyQtWebEngine==5.12.1 # rq.filter: < 5.13

View File

@ -0,0 +1,4 @@
#@ filter: PyQt5 < 5.13
#@ filter: PyQtWebEngine < 5.13
PyQt5 >= 5.12, < 5.13
PyQtWebEngine >= 5.12, < 5.13

View File

@ -0,0 +1,5 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
PyQt5==5.13.0 # rq.filter: < 5.14
PyQt5-sip==4.19.18
PyQtWebEngine==5.13.0 # rq.filter: < 5.14

View File

@ -0,0 +1,4 @@
#@ filter: PyQt5 < 5.14
#@ filter: PyQtWebEngine < 5.14
PyQt5 >= 5.13, < 5.14
PyQtWebEngine >= 5.13, < 5.14

View File

@ -0,0 +1,4 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
PyQt5==5.7.1 # rq.filter: < 5.8
sip==4.19.8

View File

@ -0,0 +1,2 @@
#@ filter: PyQt5 < 5.8
PyQt5 >= 5.7, < 5.8

View File

@ -0,0 +1,4 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
PyQt5==5.8.2 # rq.filter: < 5.9
sip==4.19.8

View File

@ -0,0 +1,2 @@
#@ filter: PyQt5 < 5.9
PyQt5 >= 5.8, < 5.9

20
tox.ini
View File

@ -13,8 +13,8 @@ skipsdist = true
setenv =
QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms
PYTEST_QT_API=pyqt5
pyqt{,56,571,59,510,511,512,513}: LINK_PYQT_SKIP=true
pyqt{,56,571,59,510,511,512,513}: QUTE_BDD_WEBENGINE=true
pyqt{,57,59,510,511,512,513}: LINK_PYQT_SKIP=true
pyqt{,57,59,510,511,512,513}: 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 =
@ -25,16 +25,12 @@ deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-tests.txt
pyqt: -r{toxinidir}/misc/requirements/requirements-pyqt.txt
pyqt571: PyQt5==5.7.1
pyqt59: PyQt5==5.9.2
pyqt510: PyQt5==5.10.1
pyqt511: PyQt5==5.11.3
#
pyqt512: PyQt5==5.12.3
pyqt512: PyQtWebEngine==5.12.1
#
pyqt513: PyQt5==5.13.0
pyqt513: PyQtWebEngine==5.13.0
pyqt57: -r{toxinidir}/misc/requirements/requirements-pyqt-5.7.txt
pyqt59: -r{toxinidir}/misc/requirements/requirements-pyqt-5.9.txt
pyqt510: -r{toxinidir}/misc/requirements/requirements-pyqt-5.10.txt
pyqt511: -r{toxinidir}/misc/requirements/requirements-pyqt-5.11.txt
pyqt512: -r{toxinidir}/misc/requirements/requirements-pyqt-5.12.txt
pyqt513: -r{toxinidir}/misc/requirements/requirements-pyqt-5.13.txt
commands =
{envpython} scripts/link_pyqt.py --tox {envdir}
{envpython} -bb -m pytest {posargs:tests}