From 21ac559a6505452609b7c305d7e2c6479cefd22c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Mon, 12 Dec 2022 13:42:32 +0100
Subject: More adjustments for tox 4 subtleties

---
 .github/workflows/ci.yml |  7 ++++++-
 tox.ini                  | 16 ++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3bebcfbc4..9e1b8fc3c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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]')"
diff --git a/tox.ini b/tox.ini
index 14ad03caa..7e4bcf5c1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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
 
-- 
cgit v1.2.3-54-g00ecf