diff options
| author | Florian Bruhin <me@the-compiler.org> | 2019-12-19 23:49:34 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2019-12-20 11:24:25 +0100 |
| commit | 3fe89ce84fa585332493995a3c54b613b7c640c3 (patch) | |
| tree | b9d29e5d5152c7266a5e39aeca61df080bfafd1a | |
| parent | 3178fb3f2a2fd59d809bc3d9caad933752206254 (diff) | |
| download | qutebrowser-3fe89ce84fa585332493995a3c54b613b7c640c3.tar.gz qutebrowser-3fe89ce84fa585332493995a3c54b613b7c640c3.zip | |
tox: Add Qt 5.14
Also use Qt 5.14 for linters/etc. as it seems to work fine there.
| -rw-r--r-- | misc/requirements/requirements-pyqt-5.14.txt | 5 | ||||
| -rw-r--r-- | misc/requirements/requirements-pyqt-5.14.txt-raw | 4 | ||||
| -rw-r--r-- | misc/requirements/requirements-pyqt.txt | 4 | ||||
| -rw-r--r-- | tox.ini | 5 |
4 files changed, 14 insertions, 4 deletions
diff --git a/misc/requirements/requirements-pyqt-5.14.txt b/misc/requirements/requirements-pyqt-5.14.txt new file mode 100644 index 000000000..5c713f7b4 --- /dev/null +++ b/misc/requirements/requirements-pyqt-5.14.txt @@ -0,0 +1,5 @@ +# This file is automatically generated by scripts/dev/recompile_requirements.py + +PyQt5==5.14.0 # rq.filter: < 5.15 +PyQt5-sip==12.7.0 +PyQtWebEngine==5.14.0 # rq.filter: < 5.15 diff --git a/misc/requirements/requirements-pyqt-5.14.txt-raw b/misc/requirements/requirements-pyqt-5.14.txt-raw new file mode 100644 index 000000000..9dadfc846 --- /dev/null +++ b/misc/requirements/requirements-pyqt-5.14.txt-raw @@ -0,0 +1,4 @@ +#@ filter: PyQt5 < 5.15 +#@ filter: PyQtWebEngine < 5.15 +PyQt5 >= 5.14, < 5.15 +PyQtWebEngine >= 5.14, < 5.15 diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt index b616d29e1..1c1a8aabd 100644 --- a/misc/requirements/requirements-pyqt.txt +++ b/misc/requirements/requirements-pyqt.txt @@ -1,5 +1,5 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -PyQt5==5.13.2 +PyQt5==5.14.0 PyQt5-sip==12.7.0 -PyQtWebEngine==5.13.2 +PyQtWebEngine==5.14.0 @@ -13,8 +13,8 @@ skipsdist = true setenv = QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms PYTEST_QT_API=pyqt5 - pyqt{,57,59,510,511,512,513}: LINK_PYQT_SKIP=true - pyqt{,57,59,510,511,512,513}: QUTE_BDD_WEBENGINE=true + pyqt{,57,59,510,511,512,513,514}: LINK_PYQT_SKIP=true + pyqt{,57,59,510,511,512,513,514}: 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 = 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 + pyqt514: -r{toxinidir}/misc/requirements/requirements-pyqt-5.14.txt commands = {envpython} scripts/link_pyqt.py --tox {envdir} {envpython} -bb -m pytest {posargs:tests} |