diff options
author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-01-28 13:03:31 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-28 13:03:31 +0300 |
commit | 6926a3ed915c2695fbbba49f36241d18bc1279fa (patch) | |
tree | 917bbf5e11f7b1b8dc8e87792d919cd3717fd8b6 /setup.py | |
parent | 9f5c676322200f0402a32873ba6cac6c6a0ff680 (diff) | |
parent | 01caa52355c276fb0e9c2ab31c5321f63c8bba74 (diff) |
Merge branch '1.7-release' into use_flake8-import-order
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -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', 'flake8-import-order', ], 'test:python_version<"3"': [ @@ -227,15 +227,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, ) |