Merge branch 'fix-metadata' into 'master'

Use extras_require instead of conditional code.

See merge request !191
This commit is contained in:
Ian Cordasco 2017-07-27 23:39:08 +00:00
commit 1bd88848ce

View file

@ -23,11 +23,17 @@ requires = [
"setuptools >= 30", "setuptools >= 30",
] ]
if sys.version_info < (3, 4): extras_require = {
requires.append("enum34") ":python_version<'3.4'": ['enum34'],
":python_version<'3.2'": ['configparser'],
}
if sys.version_info < (3, 2): if int(setuptools.__version__.split('.')[0]) < 18:
requires.append("configparser") extras_require = {}
if sys.version_info < (3, 4):
requires.append('enum34')
if sys.version_info < (3, 2):
requires.append('configparser')
def get_long_description(): def get_long_description():
@ -65,6 +71,7 @@ setuptools.setup(
"flake8.plugins", "flake8.plugins",
], ],
install_requires=requires, install_requires=requires,
extras_require=extras_require,
entry_points={ entry_points={
'distutils.commands': [ 'distutils.commands': [
'flake8 = flake8.main.setuptools_command:Flake8' 'flake8 = flake8.main.setuptools_command:Flake8'