summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2022-03-30 09:56:49 +0200
committerFlorian Bruhin <me@the-compiler.org>2022-03-30 09:57:53 +0200
commite494100582f77fa09846957c0bfb782fa996f0cb (patch)
treef48fa530aee60a1b1a7fb4971405f9447c4a4fd8
parentc0677c0f6f601e9233ef6cc4b44afdc4c5b2a29a (diff)
downloadqutebrowser-e494100582f77fa09846957c0bfb782fa996f0cb.tar.gz
qutebrowser-e494100582f77fa09846957c0bfb782fa996f0cb.zip
ci: Switch to FORCE_COLOR
pytest understands that since a while: https://pytest.org/en/7.0.x/reference/reference.html#environment-variables and other tools are adopting it: https://github.com/sphinx-doc/sphinx/pull/10260
-rw-r--r--.github/workflows/bleeding.yml2
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--tox.ini2
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/bleeding.yml b/.github/workflows/bleeding.yml
index 435141e56..b2370357f 100644
--- a/.github/workflows/bleeding.yml
+++ b/.github/workflows/bleeding.yml
@@ -15,7 +15,7 @@ jobs:
container:
image: "qutebrowser/ci:archlinux-webengine-unstable"
env:
- PY_COLORS: "1"
+ FORCE_COLOR: "1"
DOCKER: "archlinux-webengine-unstable"
CI: true
PYTEST_ADDOPTS: "--color=yes"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1e11e0dc3..afcf720e4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
- 'dependabot/*'
pull_request:
env:
- PY_COLORS: "1"
+ FORCE_COLOR: "1"
MYPY_FORCE_TERMINAL_WIDTH: "180"
jobs:
diff --git a/tox.ini b/tox.ini
index 8d6fa011e..370adbc9e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ setenv =
PYTEST_QT_API=pyqt5
pyqt{,512,513,514,515,5150}: LINK_PYQT_SKIP=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 PY_COLORS 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}