summary refs log tree commit diff
path: root/setup.cfg
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-07-26 11:49:40 +0100
committerRichard van der Hoff <richard@matrix.org>2016-07-26 11:49:40 +0100
commitdb4f823d34c6ebe30ce8f4f957c20f6e0a627ecc (patch)
tree28a7c7d717701a13e384ee5cb8c36734d9c2c91a /setup.cfg
parentMerge pull request #949 from matrix-org/rav/update_devices (diff)
downloadsynapse-db4f823d34c6ebe30ce8f4f957c20f6e0a627ecc.tar.xz
Fix flake8 configuration
Apparently flake8 v3 doesn't like trailing comments on config settings.

Also remove the pep8 config, which didn't work (because it was missing W503)
and duplicated the flake8 config. We don't use pep8 on its own, so the config
was duplicative.
Diffstat (limited to '')
-rw-r--r--setup.cfg6
1 files changed, 2 insertions, 4 deletions
diff --git a/setup.cfg b/setup.cfg
index 5ebce1c56b..da8eafbb39 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,5 @@ ignore =
 
 [flake8]
 max-line-length = 90
-ignore = W503 ; W503 requires that binary operators be at the end, not start, of lines. Erik doesn't like it.
-
-[pep8]
-max-line-length = 90
+#  W503 requires that binary operators be at the end, not start, of lines. Erik doesn't like it.
+ignore = W503