summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-07-13 22:15:01 +0200
committerFlorian Bruhin <me@the-compiler.org>2020-07-13 22:16:42 +0200
commitf82c8cb5fe20c31e43ba0973442d4d19b45f217e (patch)
tree0770d2bd7b87f3550e498c13070a83c998ab90d7
parent033baad2f2adbd99bb5ddfd044492d33ef6c622c (diff)
downloadqutebrowser-f82c8cb5fe20c31e43ba0973442d4d19b45f217e.tar.gz
qutebrowser-f82c8cb5fe20c31e43ba0973442d4d19b45f217e.zip
ci: Improve mypy output
- Set MYPY_FORCE_TERMINAL_WIDTH to get 180-column output (rather than 80), so that error messages fit on one line. - Set MYPY_FORCE_COLOR to get colored output - Adjust problemmatcher regex accordingly
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--scripts/dev/ci/problemmatchers.py2
-rw-r--r--tox.ini2
3 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e1d6ed118..5a1f1f7fd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,6 +2,8 @@ name: CI
on: [push, pull_request]
env:
PY_COLORS: "1"
+ MYPY_FORCE_TERMINAL_WIDTH: "180"
+ MYPY_FORCE_COLOR: "1"
jobs:
linters:
diff --git a/scripts/dev/ci/problemmatchers.py b/scripts/dev/ci/problemmatchers.py
index 32da86ebd..cf1e6e7df 100644
--- a/scripts/dev/ci/problemmatchers.py
+++ b/scripts/dev/ci/problemmatchers.py
@@ -89,7 +89,7 @@ MATCHERS = {
{
"pattern": [
{
- "regexp": r"^([^:]+):(\d+): ([^:]+): (.*) \[(.*)\]$",
+ "regexp": r"^([^:]+):(\d+): \033\[1m\033\[31m([^:]+):\033\[m (.*) \033\[m\033\[33m\[(.*)\]\033\[m$",
"file": 1,
"line": 2,
"severity": 3,
diff --git a/tox.ini b/tox.ini
index 7a5c37d10..2d9081c47 100644
--- a/tox.ini
+++ b/tox.ini
@@ -197,7 +197,7 @@ commands = bash scripts/dev/run_shellcheck.sh {posargs}
[testenv:mypy]
basepython = {env:PYTHON:python3}
pip_version = pip
-passenv = TERM
+passenv = TERM MYPY_FORCE_TERMINAL_WIDTH MYPY_FORCE_COLOR
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-dev.txt