summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2022-07-06 16:10:33 +0200
committerFlorian Bruhin <me@the-compiler.org>2022-08-23 18:31:42 +0200
commita516ad98fdb4a9d18084eaf304749575b184c4f8 (patch)
tree9afa89abb28d5ed0d5a9a689cff1710bde096325 /tox.ini
parentf7753550f2c1dcb2348e4779fd5287166754827e (diff)
downloadqutebrowser-a516ad98fdb4a9d18084eaf304749575b184c4f8.tar.gz
qutebrowser-a516ad98fdb4a9d18084eaf304749575b184c4f8.zip
tox: Simplify tox syntax
We can use negative factors now, and Qt 6.2/6.3 can be simplified too. See https://tox.wiki/en/latest/config.html#complex-factor-conditions
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini9
1 files changed, 3 insertions, 6 deletions
diff --git a/tox.ini b/tox.ini
index 2f9b198e5..bf7b1fcbd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,11 +13,8 @@ minversion = 3.20
setenv =
PYTEST_QT_API=pyqt5
QUTE_QT_WRAPPER=PyQt5
- pyqt62: PYTEST_QT_API=pyqt6
- pyqt62: QUTE_QT_WRAPPER=PyQt6
- pyqt63: PYTEST_QT_API=pyqt6
- pyqt63: QUTE_QT_WRAPPER=PyQt6
- pyqt{,515,5152,62,63}: LINK_PYQT_SKIP=true
+ pyqt{62,63}: PYTEST_QT_API=pyqt6
+ pyqt{62,63}: QUTE_QT_WRAPPER=PyQt6
cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI XDG_* QUTE_* DOCKER QT_QUICK_BACKEND FORCE_COLOR DBUS_SESSION_BUS_ADDRESS
basepython =
@@ -37,7 +34,7 @@ deps =
pyqt62: -r{toxinidir}/misc/requirements/requirements-pyqt-6.2.txt
pyqt63: -r{toxinidir}/misc/requirements/requirements-pyqt-6.3.txt
commands =
- {envpython} scripts/link_pyqt.py --tox {envdir}
+ !pyqt-!pyqt515-!pyqt5152-!pyqt62-!pyqt63: {envpython} scripts/link_pyqt.py --tox {envdir}
{envpython} -bb -m pytest {posargs:tests}
cov: {envpython} scripts/dev/check_coverage.py {posargs}