diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-07-19 13:17:07 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 13:17:07 +1000 |
| commit | 77091d7e8e1de6aaf86e0841b41771e1c6d153b4 (patch) | |
| tree | 654664925c3a90ab4f1803e8e8d6c7112f86a131 | |
| parent | Merge pull request #3553 from matrix-org/rav/background_process_tracking (diff) | |
| parent | changelog (diff) | |
| download | synapse-77091d7e8e1de6aaf86e0841b41771e1c6d153b4.tar.xz | |
Merge pull request #3559 from matrix-org/rav/pep8_config
add config for pep8
| -rw-r--r-- | changelog.d/3559.misc | 1 | ||||
| -rw-r--r-- | setup.cfg | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/changelog.d/3559.misc b/changelog.d/3559.misc new file mode 100644 index 0000000000..26df859e45 --- /dev/null +++ b/changelog.d/3559.misc @@ -0,0 +1 @@ +add config for pep8 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 |