diff options
| author | Ben Banfield-Zanin <benbz@matrix.org> | 2020-09-15 11:44:49 +0100 |
|---|---|---|
| committer | Ben Banfield-Zanin <benbz@matrix.org> | 2020-09-15 11:44:49 +0100 |
| commit | 1a7d96aa6ff81638f2ea696fdee2ec44e7bff75a (patch) | |
| tree | 1839e80f89c53b34ff1b36974305c6cb0c94aab4 /setup.cfg | |
| parent | Fix group server for older synapse (diff) | |
| parent | Clarify changelog. (diff) | |
| download | synapse-1a7d96aa6ff81638f2ea696fdee2ec44e7bff75a.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.20.0' into bbz/info-mainline-1.20.0 github/bbz/info-mainline-1.20.0 bbz/info-mainline-1.20.0
Diffstat (limited to 'setup.cfg')
| -rw-r--r-- | setup.cfg | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/setup.cfg b/setup.cfg index 12a7849081..a32278ea8a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,12 +26,11 @@ ignore=W503,W504,E203,E731,E501 [isort] line_length = 88 -not_skip = __init__.py sections=FUTURE,STDLIB,COMPAT,THIRDPARTY,TWISTED,FIRSTPARTY,TESTS,LOCALFOLDER default_section=THIRDPARTY known_first_party = synapse known_tests=tests -known_compat = mock,six +known_compat = mock known_twisted=twisted,OpenSSL multi_line_output=3 include_trailing_comma=true |