summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2021-03-31 14:19:14 -0400
committerPatrick Cloke <patrickc@matrix.org>2021-03-31 14:19:14 -0400
commite32294f54b95ccdf2d698fe95c89210825788552 (patch)
treed9b5be2e763949696288e185c5979ead5010cc2d
parentMake sample config allowed_local_3pids regex stricter. (#9719) (diff)
parentRevert "Use 'dmypy run' in lint.sh instead of 'mypy' (#9701)" (#9720) (diff)
downloadsynapse-e32294f54b95ccdf2d698fe95c89210825788552.tar.xz
Merge branch 'release-v1.31.0' into develop
-rw-r--r--changelog.d/9720.misc1
-rwxr-xr-xscripts-dev/lint.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/9720.misc b/changelog.d/9720.misc
new file mode 100644
index 0000000000..9dd0bc9cff
--- /dev/null
+++ b/changelog.d/9720.misc
@@ -0,0 +1 @@
+Revert using `dmypy run` in lint script.
diff --git a/scripts-dev/lint.sh b/scripts-dev/lint.sh
index 41415ee07b..9761e97594 100755
--- a/scripts-dev/lint.sh
+++ b/scripts-dev/lint.sh
@@ -95,4 +95,4 @@ isort "${files[@]}"
 python3 -m black "${files[@]}"
 ./scripts-dev/config-lint.sh
 flake8 "${files[@]}"
-dmypy run
+mypy