Merge pull request #1455 from PyCQA/simplify-flake8-config

simplify our own flake8 config

docs/source/conf.py

@@ -10,13 +10,11 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
-import os
-import sys
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 # sys.path.insert(0, os.path.abspath('.'))
+import flake8
 
 # -- General configuration ------------------------------------------------
 
@@ -56,8 +54,6 @@ project = "flake8"
 copyright = "2016, Ian Stapleton Cordasco"
 author = "Ian Stapleton Cordasco"
 
-import flake8
-
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
@@ -218,13 +214,13 @@ htmlhelp_basename = "flake8doc"
 
 latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
+    # 'papersize': 'letterpaper',
     # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
+    # 'pointsize': '10pt',
     # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
+    # 'preamble': '',
     # Latex figure (float) alignment
-    #'figure_align': 'htbp',
+    # 'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples

tox.ini

@@ -118,26 +118,8 @@ commands =
     {[testenv:build]commands}
     twine upload --skip-existing dist/*
 
-# Flake8 Configuration
 [flake8]
-# Ignore some flake8-docstrings errors
-# NOTE(sigmavirus24): While we're still using flake8 2.x, this ignore line
-# defaults to selecting all other errors so we do not need select=E,F,W,I,D
-# Once Flake8 3.0 is released and in a good state, we can use both and it will
-# work well \o/
-ignore = D203, W503, E203, N818
+extend-ignore = E203
 per-file-ignores =
     src/flake8/formatting/_windows_color.py: N806
-exclude =
-    .tox,
-    .git,
-    __pycache__,
-    docs/source/conf.py,
-    build,
-    dist,
-    tests/fixtures/*,
-    *.pyc,
-    *.egg-info,
-    .cache,
-    .eggs
 max-complexity = 10