summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2022-12-13 09:05:32 +0100
committerFlorian Bruhin <me@the-compiler.org>2022-12-13 09:05:32 +0100
commitb4d32e04f42d0c4994a234105f01aabe0aba6ce0 (patch)
tree388355af97e3c41020a1c996bac844dbcf4bae6b /tox.ini
parentac761234c9de65bd6b25ae8b2eeae0828c98a99c (diff)
parent5afc8a68191160f8d5c74b92874a0032d3c1996e (diff)
downloadqutebrowser-b4d32e04f42d0c4994a234105f01aabe0aba6ce0.tar.gz
qutebrowser-b4d32e04f42d0c4994a234105f01aabe0aba6ce0.zip
Merge branch 'master' into qt6-v2
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini37
1 files changed, 29 insertions, 8 deletions
diff --git a/tox.ini b/tox.ini
index 4c72acaf5..b1f8f9ed4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,20 @@ setenv =
pyqt{62,63,64}: PYTEST_QT_API=pyqt6
pyqt{62,63,64}: 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
+passenv =
+ PYTHON
+ DISPLAY
+ XAUTHORITY
+ HOME
+ USERNAME
+ USER
+ CI
+ XDG_*
+ QUTE_*
+ DOCKER
+ QT_QUICK_BACKEND
+ FORCE_COLOR
+ DBUS_SESSION_BUS_ADDRESS
basepython =
py: {env:PYTHON:python3}
py3: {env:PYTHON:python3}
@@ -144,10 +157,12 @@ commands =
[testenv:docs]
basepython = {env:PYTHON:python3}
-whitelist_externals = git
-passenv = CI GITHUB_REF
+passenv =
+ CI
+ GITHUB_REF
deps =
-r{toxinidir}/requirements.txt
+ -r{toxinidir}/misc/requirements/requirements-docs.txt
-r{toxinidir}/misc/requirements/requirements-pyqt.txt
commands =
{envpython} scripts/dev/src2asciidoc.py {posargs}
@@ -156,7 +171,10 @@ commands =
[testenv:pyinstaller-{64,32}{,-qt6}]
basepython = {env:PYTHON:python3}
-passenv = APPDATA HOME PYINSTALLER_DEBUG
+passenv =
+ APPDATA
+ HOME
+ PYINSTALLER_DEBUG
setenv =
qt6: PYINSTALLER_QT6=true
deps =
@@ -171,19 +189,21 @@ commands =
basepython = python3
deps =
passenv = TERM
-whitelist_externals = eslint
+allowlist_externals = eslint
changedir = {toxinidir}/qutebrowser/javascript
commands = eslint --report-unused-disable-directives .
[testenv:shellcheck]
basepython = python3
deps =
-whitelist_externals = bash
+allowlist_externals = bash
commands = bash scripts/dev/run_shellcheck.sh {posargs}
[testenv:mypy-{pyqt5,pyqt6}]
basepython = {env:PYTHON:python3}
-passenv = TERM MYPY_FORCE_TERMINAL_WIDTH
+passenv =
+ TERM
+ MYPY_FORCE_TERMINAL_WIDTH
setenv =
pyqt6: QUTE_CONSTANTS_ARGS=--always-true=USE_PYQT6 --always-false=USE_PYQT5 --always-false=USE_PYSIDE2 --always-false=USE_PYSIDE6 --always-false=IS_QT5 --always-true=IS_QT6
pyqt5: QUTE_CONSTANTS_ARGS=--always-false=USE_PYQT6 --always-true=USE_PYQT5 --always-false=USE_PYSIDE2 --always-false=USE_PYSIDE6 --always-true=IS_QT5 --always-false=IS_QT6
@@ -205,7 +225,7 @@ commands =
[testenv:actionlint]
basepython = python3
deps =
-whitelist_externals = actionlint
+allowlist_externals = actionlint
commands =
actionlint
@@ -241,6 +261,7 @@ usedevelop = true
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-tox.txt
+ -r{toxinidir}/misc/requirements/requirements-docs.txt
!qt6: -r{toxinidir}/misc/requirements/requirements-pyqt.txt
qt6: -r{toxinidir}/misc/requirements/requirements-pyqt-6.txt
-r{toxinidir}/misc/requirements/requirements-dev.txt