summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-18 20:55:37 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-18 20:55:37 +0100
commit3f9e649f1720b3419fd8008771955714baa9600b (patch)
tree3e932f483f855e537ec61f9044d5135c3771d6bc
parentMerge pull request #3553 from matrix-org/rav/background_process_tracking (diff)
downloadsynapse-3f9e649f1720b3419fd8008771955714baa9600b.tar.xz
add config for pep8
Since, for better or worse, we seem to have configured isort to generate
89-character lines, pycharm is now complaining at me that our lines are too
long.

So, let's configure pep8 to behave consistently with flake8.
-rw-r--r--setup.cfg11
1 files changed, 8 insertions, 3 deletions
diff --git a/setup.cfg b/setup.cfg
index 9b5b75cd60..3f84283a38 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,12 +14,17 @@ ignore =
     pylint.cfg
     tox.ini
 
-[flake8]
+[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.
+#  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
+
 [isort]
 line_length = 89
 not_skip = __init__.py