Browse Source

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
David Robertson 2 years ago
parent
commit
94a396e7c4
5 changed files with 14 additions and 13 deletions
  1. 11 0
      .flake8
  2. 1 0
      MANIFEST.in
  3. 1 1
      changelog.d/12052.misc
  4. 1 0
      changelog.d/12059.misc
  5. 0 12
      setup.cfg

+ 11 - 0
.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

+ 1 - 0
MANIFEST.in

@@ -45,6 +45,7 @@ include book.toml
 include pyproject.toml
 recursive-include changelog.d *
 
+include .flake8
 prune .circleci
 prune .github
 prune .ci

+ 1 - 1
changelog.d/12052.misc

@@ -1 +1 @@
-Move `isort` configuration to `pyproject.toml`.
+Move configuration out of `setup.cfg`.

+ 1 - 0
changelog.d/12059.misc

@@ -0,0 +1 @@
+Move configuration out of `setup.cfg`.

+ 0 - 12
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