1 files changed, 21 insertions, 2 deletions
diff --git a/setup.cfg b/setup.cfg
index da8eafbb39..c2620be6c5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,7 +14,26 @@ ignore =
     pylint.cfg
     tox.ini
 
+[pep8]
+max-line-length = 90
+#  W503 requires that binary operators be at the end, not start, of lines. Erik
+#  doesn't like it.  E203 is contrary to PEP8.
+ignore = W503,E203
+
 [flake8]
+# note that flake8 inherits the "ignore" settings from "pep8" (because it uses
+# pep8 to do those checks), but not the "max-line-length" setting
 max-line-length = 90
-#  W503 requires that binary operators be at the end, not start, of lines. Erik doesn't like it.
-ignore = W503
+
+[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
+combine_as_imports=true