tox: Use more unique env var name
(Ab)using an environment variable indeed seems like the easiest way
forward here, but since it is exposed in the environment for the called
processes, let's give it a name which is less likely to clash, and more
easily identifyable.
Follow-up to c1738ca550.
This commit is contained in:
parent
46ebef5644
commit
8dd2bd5b54
12
tox.ini
12
tox.ini
|
|
@ -184,8 +184,8 @@ commands = bash scripts/dev/run_shellcheck.sh {posargs}
|
|||
basepython = {env:PYTHON:python3}
|
||||
passenv = TERM MYPY_FORCE_TERMINAL_WIDTH
|
||||
setenv =
|
||||
pyqt6: 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: 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
|
||||
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
|
||||
deps =
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/misc/requirements/requirements-dev.txt
|
||||
|
|
@ -193,7 +193,7 @@ deps =
|
|||
-r{toxinidir}/misc/requirements/requirements-mypy.txt
|
||||
pyqt6: -r{toxinidir}/misc/requirements/requirements-pyqt-6.txt
|
||||
commands =
|
||||
{envpython} -m mypy {env:CONSTANTS_ARGS} qutebrowser {posargs}
|
||||
{envpython} -m mypy {env:QUTE_CONSTANTS_ARGS} qutebrowser {posargs}
|
||||
|
||||
[testenv:yamllint]
|
||||
basepython = {env:PYTHON:python3}
|
||||
|
|
@ -213,10 +213,10 @@ basepython = {env:PYTHON:python3}
|
|||
passenv = {[testenv:mypy-pyqt6]passenv}
|
||||
deps = {[testenv:mypy-pyqt6]deps}
|
||||
setenv =
|
||||
pyqt6: 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: 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
|
||||
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
|
||||
commands =
|
||||
{envpython} -m mypy --cobertura-xml-report {envtmpdir} {env:CONSTANTS_ARGS} qutebrowser tests {posargs}
|
||||
{envpython} -m mypy --cobertura-xml-report {envtmpdir} {env:QUTE_CONSTANTS_ARGS} qutebrowser tests {posargs}
|
||||
{envdir}/bin/diff-cover --fail-under=100 --compare-branch={env:DIFF_BRANCH:origin/{env:GITHUB_BASE_REF:master}} {envtmpdir}/cobertura.xml
|
||||
|
||||
[testenv:sphinx]
|
||||
|
|
|
|||
Loading…
Reference in New Issue