diff options
| author | David Robertson <davidr@element.io> | 2022-02-22 14:52:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-22 14:52:56 +0000 |
| commit | 94a396e7c4b4488d7f0ca08672114a4a586cf42c (patch) | |
| tree | 2963315af0c75ce6fbb73f43d74ea5335b763f71 | |
| parent | Cap the number of in-flight requests for state from a single group (#11608) (diff) | |
| download | synapse-94a396e7c4b4488d7f0ca08672114a4a586cf42c.tar.xz | |
Prune setup.cfg some more (#12059)
* Remove `trial` section from setup.cfg This was added in the initial commit from 2014. I can't see that it does anything. Maybe it's there so that you can run `trial` without any extra args, but if I do that then I just get the `--help` message. * Move flake8's config to its own file
Diffstat (limited to '')
| -rw-r--r-- | .flake8 | 11 | ||||
| -rw-r--r-- | MANIFEST.in | 1 | ||||
| -rw-r--r-- | changelog.d/12052.misc | 2 | ||||
| -rw-r--r-- | changelog.d/12059.misc | 1 | ||||
| -rw-r--r-- | setup.cfg | 12 |
5 files changed, 14 insertions, 13 deletions
diff --git a/.flake8 b/.flake8 new file mode 100644 index 0000000000..acb118c86e --- /dev/null +++ b/.flake8 @@ -0,0 +1,11 @@ +# TODO: incorporate this into pyproject.toml if flake8 supports it in the future. +# See https://github.com/PyCQA/flake8/issues/234 +[flake8] +# 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 +# E501: Line too long (black enforces this for us) +ignore=W503,W504,E203,E731,E501 diff --git a/MANIFEST.in b/MANIFEST.in index c24786c3b3..76d14eb642 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -45,6 +45,7 @@ include book.toml include pyproject.toml recursive-include changelog.d * +include .flake8 prune .circleci prune .github prune .ci diff --git a/changelog.d/12052.misc b/changelog.d/12052.misc index fbaff67e95..11755ae61b 100644 --- a/changelog.d/12052.misc +++ b/changelog.d/12052.misc @@ -1 +1 @@ -Move `isort` configuration to `pyproject.toml`. +Move configuration out of `setup.cfg`. diff --git a/changelog.d/12059.misc b/changelog.d/12059.misc new file mode 100644 index 0000000000..9ba4759d99 --- /dev/null +++ b/changelog.d/12059.misc @@ -0,0 +1 @@ +Move configuration out of `setup.cfg`. \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index a0506572d9..6213f3265b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,3 @@ -[trial] -test_suite = tests - [check-manifest] ignore = .git-blame-ignore-revs @@ -10,12 +7,3 @@ ignore = pylint.cfg tox.ini -[flake8] -# 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 -# E501: Line too long (black enforces this for us) -ignore=W503,W504,E203,E731,E501 |