diff options
| author | David Robertson <davidr@element.io> | 2022-04-28 11:32:50 +0100 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2022-04-28 11:33:05 +0100 |
| commit | 5d3509dfda607323892f1cc96d7421612816e803 (patch) | |
| tree | 7eb94bb066b8ed0b23fa160056b5e9bcdb29dd8e | |
| parent | changelog (diff) | |
| download | synapse-5d3509dfda607323892f1cc96d7421612816e803.tar.xz | |
Revert accidental direct-to-develop commits.
This reverts commit 5a320baa45b8e826e52bdd6cadadfad727ab0357. This reverts commit f282d5fc1185dde3f9ec31c49b630cff962545d7. This reverts commit ce6ecdd4b4939fd99418bc949b40c01d39480489.
| -rw-r--r-- | .github/workflows/latest_deps.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/twisted_trunk.yml | 2 | ||||
| -rw-r--r-- | changelog.d/12576.misc | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/.github/workflows/latest_deps.yml b/.github/workflows/latest_deps.yml index c537a5a60f..1a61d179d9 100644 --- a/.github/workflows/latest_deps.yml +++ b/.github/workflows/latest_deps.yml @@ -32,15 +32,12 @@ 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 # `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 5f0671f350..8fc1affb77 100644 --- a/.github/workflows/twisted_trunk.yml +++ b/.github/workflows/twisted_trunk.yml @@ -24,8 +24,6 @@ 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: diff --git a/changelog.d/12576.misc b/changelog.d/12576.misc deleted file mode 100644 index 71022c8633..0000000000 --- a/changelog.d/12576.misc +++ /dev/null @@ -1 +0,0 @@ -Allow unused `#type: ignore` comments in bleeding edge CI jobs. |