diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-20 11:59:14 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-06-20 11:59:14 +0100 |
| commit | 45f28a9d2fc0466dcf2a05b0063b7caa3b7e12c3 (patch) | |
| tree | 07bb21377c6611db89f64f948a2e27645662ff0e /setup.cfg | |
| parent | Add descriptions and remove redundant set(..) (diff) | |
| parent | Run Black. (#5482) (diff) | |
| download | synapse-45f28a9d2fc0466dcf2a05b0063b7caa3b7e12c3.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/histogram_extremities
Diffstat (limited to 'setup.cfg')
| -rw-r--r-- | setup.cfg | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/setup.cfg b/setup.cfg index b6b4aa740d..12a7849081 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,18 +15,17 @@ ignore = tox.ini [flake8] -max-line-length = 90 - # see https://pycodestyle.readthedocs.io/en/latest/intro.html#error-codes # for error codes. The ones we ignore are: # W503: line break before binary operator # W504: line break after binary operator # E203: whitespace before ':' (which is contrary to pep8?) # E731: do not assign a lambda expression, use a def -ignore=W503,W504,E203,E731 +# E501: Line too long (black enforces this for us) +ignore=W503,W504,E203,E731,E501 [isort] -line_length = 89 +line_length = 88 not_skip = __init__.py sections=FUTURE,STDLIB,COMPAT,THIRDPARTY,TWISTED,FIRSTPARTY,TESTS,LOCALFOLDER default_section=THIRDPARTY |