summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-07-02 21:26:44 +0200
committerFlorian Bruhin <me@the-compiler.org>2020-07-02 22:21:07 +0200
commit8d1a8540c5c2c8999ae945a23af08811628429ae (patch)
treef18d29c6938e018b95d9646173bcae3e38a8c81b
parent33b5db97e75f4ab2a2052d27ca96ee2b325dbcfa (diff)
downloadqutebrowser-8d1a8540c5c2c8999ae945a23af08811628429ae.tar.gz
qutebrowser-8d1a8540c5c2c8999ae945a23af08811628429ae.zip
ci: Force pytest colors for CI
For some reason, pytest on GitHub doesn't display any colors.
-rw-r--r--.github/workflows/ci.yml1
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8a2a98c4e..efc10d1b6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,6 +50,7 @@ jobs:
QUTE_BDD_WEBENGINE: "${{ matrix.image != 'archlinux-webkit' }}"
DOCKER: "${{ matrix.image }}"
CI: true
+ PYTEST_ADDOPTS: "--color=yes"
options: --privileged --tty
steps:
- uses: actions/checkout@v2
diff --git a/tox.ini b/tox.ini
index 9142dd49a..ed093c299 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ setenv =
pyqt{,57,59,510,511,512,513,514,515}: LINK_PYQT_SKIP=true
pyqt{,57,59,510,511,512,513,514,515}: QUTE_BDD_WEBENGINE=true
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
+passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI XDG_* QUTE_* DOCKER QT_QUICK_BACKEND PYTEST_ADDOPTS
basepython =
py35: {env:PYTHON:python3.5}
py36: {env:PYTHON:python3.6}