From 5ec6ae3ad0b5f61711448b62e992a77c7ac4857f Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Thu, 18 Oct 2018 09:19:35 +0100 Subject: [Packaging] Minimal requirements for test_requires in setup.py Remove extra_requires since requirements-*.txt files provides these now plus the extras_requires is for extras at installation time which does not apply to docs or dev. For test_requires include the minimal requirements for pytest to run. This is not the same as the longer tox test requirements that include linting, docs etcs. Fix license field. --- setup.py | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 8d37b678a..04bd604b7 100755 --- a/setup.py +++ b/setup.py @@ -561,24 +561,7 @@ install_requires = [ "certifi; sys.platform == 'win32'", 'zope.interface', ] -docs_require = ['sphinx', 'recommonmark', 'sphinx-rtd-theme'] -tests_require = [ - 'coverage', - 'flake8', - 'flake8-blind-except', - 'flake8-builtins', - 'flake8-commas', - 'flake8-comprehensions', - 'flake8-debugger', - 'flake8-isort', - 'flake8-mock', - 'flake8-mutable', - 'flake8-quotes', - 'pre-commit', - 'pytest', - 'detox', - 'tox', -] +tests_require = ['pytest', 'pytest-twisted'] # Main setup setup( @@ -610,15 +593,10 @@ setup( 'Operating System :: POSIX', 'Topic :: Internet', ], - license='GPLv3', + license='GPLv3+', cmdclass=cmdclass, setup_requires=setup_requires, install_requires=install_requires, - extras_require={ - 'docs': docs_require, - 'tests': tests_require, - 'dev': docs_require + tests_require, - }, tests_require=tests_require, data_files=_data_files, package_data=_package_data, -- cgit v1.2.3