From 1aeefe19685ba108c237bcd59cdfcd3bc0edc604 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Mon, 13 Jul 2020 22:34:51 +0200
Subject: [PATCH] ci: Disable mypy coloring again

Looks like mypy uses curses to get colors, so there's really nothing we can do
here on GitHub Actions.
---
 .github/workflows/ci.yml          | 1 -
 scripts/dev/ci/problemmatchers.py | 2 +-
 tox.ini                           | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a4dccca92..4ffea6cb2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,6 @@ 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 cf1e6e7df..32da86ebd 100644
--- a/scripts/dev/ci/problemmatchers.py
+++ b/scripts/dev/ci/problemmatchers.py
@@ -89,7 +89,7 @@ MATCHERS = {
         {
             "pattern": [
                 {
-                    "regexp": r"^([^:]+):(\d+): \033\[1m\033\[31m([^:]+):\033\[m (.*)  \033\[m\033\[33m\[(.*)\]\033\[m$",
+                    "regexp": r"^([^:]+):(\d+): ([^:]+): (.*)  \[(.*)\]$",
                     "file": 1,
                     "line": 2,
                     "severity": 3,
diff --git a/tox.ini b/tox.ini
index 2d9081c47..3f1090e84 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 MYPY_FORCE_TERMINAL_WIDTH MYPY_FORCE_COLOR
+passenv = TERM MYPY_FORCE_TERMINAL_WIDTH
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-dev.txt