From 4fadcada2be2d8c4ecc72da1af3b02dd528767f9 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Thu, 28 Apr 2022 11:27:42 +0100 Subject: [PATCH 1/3] Allow unused ignores in "bleeding edge" CI Where "bleeding edge" means the Twisted Trunk and Latest Deps jobs. Follow up from #12531. Resolves #12574. --- .github/workflows/latest_deps.yml | 2 ++ .github/workflows/twisted_trunk.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/latest_deps.yml b/.github/workflows/latest_deps.yml index 1a61d179d905..41da1c74088c 100644 --- a/.github/workflows/latest_deps.yml +++ b/.github/workflows/latest_deps.yml @@ -38,6 +38,8 @@ jobs: # `pip install matrix-synapse[all]` as closely as possible. - run: poetry update --no-dev - run: poetry run pip list > after.txt && (diff -u before.txt after.txt || true) + - name: Remove warn_unused_ignores from mypy config + run: sed '/warn_unused_ignores = True/d' -i mypy.ini - run: poetry run mypy trial: runs-on: ubuntu-latest diff --git a/.github/workflows/twisted_trunk.yml b/.github/workflows/twisted_trunk.yml index 8fc1affb7746..5f0671f3503a 100644 --- a/.github/workflows/twisted_trunk.yml +++ b/.github/workflows/twisted_trunk.yml @@ -24,6 +24,8 @@ jobs: poetry remove twisted poetry add --extras tls git+https://github.com/twisted/twisted.git#trunk poetry install --no-interaction --extras "all test" + - name: Remove warn_unused_ignores from mypy config + run: sed '/warn_unused_ignores = True/d' -i mypy.ini - run: poetry run mypy trial: From 505d8611a6cd3701ca7ca106f4976c4189081a84 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Thu, 28 Apr 2022 11:29:13 +0100 Subject: [PATCH 2/3] Use `--extras all` in latest deps mypy CI Twisted trunk job already does this. Missed in #12531. --- .github/workflows/latest_deps.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/latest_deps.yml b/.github/workflows/latest_deps.yml index 41da1c74088c..c537a5a60f9f 100644 --- a/.github/workflows/latest_deps.yml +++ b/.github/workflows/latest_deps.yml @@ -32,6 +32,7 @@ jobs: with: python-version: "3.x" poetry-version: "1.2.0b1" + extras: "all" # Dump installed versions for debugging. - run: poetry run pip list > before.txt # Upgrade all runtime dependencies only. This is intended to mimic a fresh From a035a43753d6b415852cf20de4c22d327ecccaba Mon Sep 17 00:00:00 2001 From: David Robertson Date: Thu, 28 Apr 2022 11:31:26 +0100 Subject: [PATCH 3/3] changelog --- changelog.d/12576.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/12576.misc diff --git a/changelog.d/12576.misc b/changelog.d/12576.misc new file mode 100644 index 000000000000..71022c86337f --- /dev/null +++ b/changelog.d/12576.misc @@ -0,0 +1 @@ +Allow unused `#type: ignore` comments in bleeding edge CI jobs.