Merge branch 'develop' into rav/enforce_report_api

1 files changed, 14 insertions, 1 deletions

diff --git a/setup.cfg b/setup.cfg

index da8eafbb39..9b5b75cd60 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,4 +17,17 @@ ignore =
 [flake8]
 max-line-length = 90
 #  W503 requires that binary operators be at the end, not start, of lines. Erik doesn't like it.
-ignore = W503
+#  E203 is contrary to PEP8.
+ignore = W503,E203
+
+[isort]
+line_length = 89
+not_skip = __init__.py
+sections=FUTURE,STDLIB,COMPAT,THIRDPARTY,TWISTED,FIRSTPARTY,TESTS,LOCALFOLDER
+default_section=THIRDPARTY
+known_first_party = synapse
+known_tests=tests
+known_compat = mock,six
+known_twisted=twisted,OpenSSL
+multi_line_output=3
+include_trailing_comma=true