diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-09-18 16:50:39 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-09-18 16:50:39 +0100 |
| commit | a078de955f34baf8c997c0782b0a1773189fc182 (patch) | |
| tree | e0b3c435dc469c96d0634d84aefe71c358043a73 /setup.cfg | |
| parent | Add comment (diff) | |
| parent | Merge pull request #3879 from matrix-org/matthew/fix-autojoin (diff) | |
| download | synapse-github/matthew/fix_overzealous_ll_state.tar.xz | |
Merge branch 'develop' into matthew/fix_overzealous_ll_state github/matthew/fix_overzealous_ll_state matthew/fix_overzealous_ll_state
Diffstat (limited to 'setup.cfg')
| -rw-r--r-- | setup.cfg | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/setup.cfg b/setup.cfg index c2620be6c5..52feaa9cc7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,13 +17,14 @@ ignore = [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 +# doesn't like it. E203 is contrary to PEP8. E731 is silly. +ignore = W503,E203,E731 [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 +ignore=W503,E203,E731 [isort] line_length = 89 |