Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 94a396e

Browse files
author
David Robertson
authored
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
1 parent dcb6a37 commit 94a396e

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

.flake8

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# TODO: incorporate this into pyproject.toml if flake8 supports it in the future.
2+
# See https://github.com/PyCQA/flake8/issues/234
3+
[flake8]
4+
# see https://pycodestyle.readthedocs.io/en/latest/intro.html#error-codes
5+
# for error codes. The ones we ignore are:
6+
# W503: line break before binary operator
7+
# W504: line break after binary operator
8+
# E203: whitespace before ':' (which is contrary to pep8?)
9+
# E731: do not assign a lambda expression, use a def
10+
# E501: Line too long (black enforces this for us)
11+
ignore=W503,W504,E203,E731,E501

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ include book.toml
4545
include pyproject.toml
4646
recursive-include changelog.d *
4747

48+
include .flake8
4849
prune .circleci
4950
prune .github
5051
prune .ci

changelog.d/12052.misc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Move `isort` configuration to `pyproject.toml`.
1+
Move configuration out of `setup.cfg`.

changelog.d/12059.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Move configuration out of `setup.cfg`.

setup.cfg

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[trial]
2-
test_suite = tests
3-
41
[check-manifest]
52
ignore =
63
.git-blame-ignore-revs
@@ -10,12 +7,3 @@ ignore =
107
pylint.cfg
118
tox.ini
129

13-
[flake8]
14-
# see https://pycodestyle.readthedocs.io/en/latest/intro.html#error-codes
15-
# for error codes. The ones we ignore are:
16-
# W503: line break before binary operator
17-
# W504: line break after binary operator
18-
# E203: whitespace before ':' (which is contrary to pep8?)
19-
# E731: do not assign a lambda expression, use a def
20-
# E501: Line too long (black enforces this for us)
21-
ignore=W503,W504,E203,E731,E501

0 commit comments

Comments
 (0)