From f3074d17470f5a403166176a9efd6198505d891c Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephen@that.guru>
Date: Fri, 26 Jan 2018 09:41:50 +0000
Subject: [PATCH] setup: Configure flake8 extension as a local plugin

We don't want to install this as a system plugin. Now that flake8 3.5.0
is in the wild, we can use this.

Signed-off-by: Stephen Finucane <stephen@that.guru>
Fixes: #4492
---
 setup.cfg |  4 ++++
 setup.py  | 13 +++----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index c19d0d518..cab6b74d1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,6 +34,10 @@ max-line-length = 95
 ignore = E116,E241,E251,E741
 exclude = .git,.tox,.venv,tests/*,build/*,doc/_build/*,sphinx/search/*,sphinx/pycode/pgen2/*,doc/ext/example*.py
 
+[flake8:local-plugins]
+extension =
+    X101 = utils.checks:sphinx_has_header
+
 [mypy]
 python_version = 2.7
 show_column_numbers = True
diff --git a/setup.py b/setup.py
index f35e5f88d..abf71df78 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 4):
     print('ERROR: Sphinx requires at least Python 2.7 or 3.4 to run.')
     sys.exit(1)
 
-requires = [
+install_requires = [
     'six>=1.5',
     'Jinja2>=2.3',
     'Pygments>=2.0',
@@ -47,7 +47,7 @@ extras_require = {
         'pytest',
         'pytest-cov',
         'html5lib',
-        'flake8',
+        'flake8>=3.5.0',
     ],
     'test:python_version<"3"': [
         'enum34',
@@ -226,15 +226,8 @@ setup(
         'distutils.commands': [
             'build_sphinx = sphinx.setup_command:BuildDoc',
         ],
-        # consider moving this to 'flake8:local-plugins' once flake8 3.5.0 is
-        # in the wild:
-        #    http://flake8.pycqa.org/en/latest/user/configuration.html\
-        #    #using-local-plugins
-        'flake8.extension': [
-            'X101 = utils.checks:sphinx_has_header',
-        ],
     },
-    install_requires=requires,
+    install_requires=install_requires,
     extras_require=extras_require,
     cmdclass=cmdclass,
 )