diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-27 09:17:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-27 09:17:11 +0100 |
| commit | 7041cd872b8f1105d58f8e8ac79ffd32c76a1994 (patch) | |
| tree | 4736db867cfd029d8e7627edb971eccc926371bc /setup.cfg | |
| parent | Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_... (diff) | |
| parent | Merge pull request #3616 from matrix-org/travis/event_id_send_leave (diff) | |
| download | synapse-7041cd872b8f1105d58f8e8ac79ffd32c76a1994.tar.xz | |
Merge branch 'develop' into send_sni_for_federation_requests
Diffstat (limited to 'setup.cfg')
| -rw-r--r-- | setup.cfg | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/setup.cfg b/setup.cfg index 9b5b75cd60..c2620be6c5 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 @@ -31,3 +36,4 @@ known_compat = mock,six known_twisted=twisted,OpenSSL multi_line_output=3 include_trailing_comma=true +combine_as_imports=true |