More adjustments for tox 4 subtleties

This commit is contained in:
Florian Bruhin 2022-12-12 13:42:32 +01:00
parent bbdc83f638
commit 21ac559a65
2 changed files with 16 additions and 7 deletions

View File

@ -73,7 +73,12 @@ jobs:
python -m pip install -U pip
python -m pip install -U -r misc/requirements/requirements-tox.txt
- name: "Run ${{ matrix.testenv }}"
run: "dbus-run-session -- tox -e ${{ matrix.testenv}} -- ${{ matrix.args }}"
run: |
if [[ -z "${{ matrix.args }}" ]]; then
dbus-run-session -- tox -e ${{ matrix.testenv }}
else
dbus-run-session -- tox -e ${{ matrix.testenv }} -- ${{ matrix.args }}
fi
tests-docker:
if: "!contains(github.event.head_commit.message, '[ci skip]')"

16
tox.ini
View File

@ -155,8 +155,9 @@ 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
@ -168,7 +169,10 @@ commands =
[testenv:pyinstaller-{64,32}]
basepython = {env:PYTHON:python3}
passenv = APPDATA HOME PYINSTALLER_DEBUG
passenv =
APPDATA
HOME
PYINSTALLER_DEBUG
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-pyinstaller.txt
@ -180,14 +184,14 @@ 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]
@ -212,7 +216,7 @@ commands =
[testenv:actionlint]
basepython = python3
deps =
whitelist_externals = actionlint
allowlist_externals = actionlint
commands =
actionlint