Merged latest master

1 files changed, 8 insertions, 1 deletions

diff --git a/.flake8 b/.flake8
index 9b1f874a..673661eb 100644
--- a/.flake8
+++ b/.flake8
@@ -1,2 +1,9 @@
 [flake8]
-ignore = E501, W191, E741, E266
+count = True
+# Several of the following could be autofixed or improved by running the code through psf/black
+ignore = E126,E128,E203,E231,E261,E302,E402,E722,F541,W191,W292,W293
+max-complexity = 40
+max-line-length = 236
+show-source = True
+statistics = True
+per-file-ignores = __init__.py:F401,F403,F405