Move setup metadata to setup.cfg

2 files changed, 96 insertions, 146 deletions

diff --git a/setup.cfg b/setup.cfg
index 109a253..528d87b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,20 +2,110 @@
 universal = 1
 
 [metadata]
+name = flake8
+version = attr: flake8.__version__
+license = MIT
 license_file = LICENSE
+description = the modular source code checker: pep8 pyflakes and co
+long_description = file: README.rst
+author = Tarek Ziade
+author_email = tarek@ziade.org
+maintainer = Ian Stapleton Cordasco
+maintainer_email = graffatcolmingov@gmail.com
+url = https://gitlab.com/pycqa/flake8
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Environment :: Console
+    Framework :: Flake8
+    Intended Audience :: Developers
+    License :: OSI Approved :: MIT License
+    Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Topic :: Software Development :: Libraries :: Python Modules
+    Topic :: Software Development :: Quality Assurance
+
+[options]
+package_dir=
+    =src
+packages = 
+    flake8
+    flake8.api
+    flake8.formatting
+    flake8.main
+    flake8.options
+    flake8.plugins
+
+install_requires=
 # We document the reasoning for using ranges here:
 # http://flake8.pycqa.org/en/latest/faq.html#why-does-flake8-use-ranges-for-its-dependencies
 # And in which releases we will update those ranges here:
 # http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8
-requires-dist =
-    enum34; python_version<"3.4"
-    typing; python_version<"3.5"
-    configparser; python_version<"3.2"
-    functools32; python_version<"3.2"
     entrypoints >= 0.3.0, < 0.4.0
     pyflakes >= 2.1.0, < 2.2.0
     pycodestyle >= 2.5.0, < 2.6.0
     mccabe >= 0.6.0, < 0.7.0
+    enum34; python_version<"3.4"
+    typing; python_version<"3.5"
+    configparser; python_version<"3.2"
+    functools32; python_version<"3.2"
+
+python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
+
+
+[options.entry_points]
+distutils.commands=
+    flake8 = flake8.main.setuptools_command:Flake8
+console_scripts =
+    flake8 = flake8.main.cli:main
+flake8.extension = 
+    F = flake8.plugins.pyflakes:FlakesChecker
+    pycodestyle.ambiguous_identifier = pycodestyle:ambiguous_identifier
+    pycodestyle.bare_except = pycodestyle:bare_except
+    pycodestyle.blank_lines = pycodestyle:blank_lines
+    pycodestyle.break_after_binary_operator = pycodestyle:break_after_binary_operator
+    pycodestyle.break_before_binary_operator = pycodestyle:break_before_binary_operator
+    pycodestyle.comparison_negative = pycodestyle:comparison_negative
+    pycodestyle.comparison_to_singleton = pycodestyle:comparison_to_singleton
+    pycodestyle.comparison_type = pycodestyle:comparison_type
+    pycodestyle.compound_statements = pycodestyle:compound_statements
+    pycodestyle.continued_indentation = pycodestyle:continued_indentation
+    pycodestyle.explicit_line_join = pycodestyle:explicit_line_join
+    pycodestyle.extraneous_whitespace = pycodestyle:extraneous_whitespace
+    pycodestyle.imports_on_separate_lines = pycodestyle:imports_on_separate_lines
+    pycodestyle.indentation = pycodestyle:indentation
+    pycodestyle.maximum_doc_length = pycodestyle:maximum_doc_length
+    pycodestyle.maximum_line_length = pycodestyle:maximum_line_length
+    pycodestyle.missing_whitespace = pycodestyle:missing_whitespace
+    pycodestyle.missing_whitespace_after_import_keyword = pycodestyle:missing_whitespace_after_import_keyword
+    pycodestyle.missing_whitespace_around_operator = pycodestyle:missing_whitespace_around_operator
+    pycodestyle.module_imports_on_top_of_file = pycodestyle:module_imports_on_top_of_file
+    pycodestyle.python_3000_async_await_keywords = pycodestyle:python_3000_async_await_keywords
+    pycodestyle.python_3000_backticks = pycodestyle:python_3000_backticks
+    pycodestyle.python_3000_has_key = pycodestyle:python_3000_has_key
+    pycodestyle.python_3000_invalid_escape_sequence = pycodestyle:python_3000_invalid_escape_sequence
+    pycodestyle.python_3000_not_equal = pycodestyle:python_3000_not_equal
+    pycodestyle.python_3000_raise_comma = pycodestyle:python_3000_raise_comma
+    pycodestyle.tabs_obsolete = pycodestyle:tabs_obsolete
+    pycodestyle.tabs_or_spaces = pycodestyle:tabs_or_spaces
+    pycodestyle.trailing_blank_lines = pycodestyle:trailing_blank_lines
+    pycodestyle.trailing_whitespace = pycodestyle:trailing_whitespace
+    pycodestyle.whitespace_around_comma = pycodestyle:whitespace_around_comma
+    pycodestyle.whitespace_around_keywords = pycodestyle:whitespace_around_keywords
+    pycodestyle.whitespace_around_named_parameter_equals = pycodestyle:whitespace_around_named_parameter_equals
+    pycodestyle.whitespace_around_operator = pycodestyle:whitespace_around_operator
+    pycodestyle.whitespace_before_comment = pycodestyle:whitespace_before_comment
+    pycodestyle.whitespace_before_parameters = pycodestyle:whitespace_before_parameters
+flake8.report =
+    default = flake8.formatting.default:Default
+    pylint = flake8.formatting.default:Pylint
+    quiet-filename = flake8.formatting.default:FilenameOnly
+    quiet-nothing = flake8.formatting.default:Nothing
 
 [mypy]
 check_untyped_defs = true
diff --git a/setup.py b/setup.py
index 088de25..20ad3d3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 """Packaging logic for Flake8."""
-import functools
-import io
 import os
 import sys
 
@@ -9,142 +7,4 @@ import setuptools
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'src'))  # noqa
 
-import flake8
-
-
-# NOTE(sigmavirus24): When updating these requirements, update them in
-# setup.cfg as well.
-requires = [
-    # We document the reasoning for using ranges here:
-    # http://flake8.pycqa.org/en/latest/faq.html#why-does-flake8-use-ranges-for-its-dependencies
-    # And in which releases we will update those ranges here:
-    # http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8
-    "entrypoints >= 0.3.0, < 0.4.0",
-    "pyflakes >= 2.1.0, < 2.2.0",
-    "pycodestyle >= 2.5.0, < 2.6.0",
-    "mccabe >= 0.6.0, < 0.7.0",
-]
-
-extras_require = {
-    ":python_version<'3.4'": ['enum34'],
-    ":python_version<'3.5'": ['typing'],
-    ":python_version<'3.2'": ['configparser', 'functools32'],
-}
-
-if int(setuptools.__version__.split('.')[0]) < 18:
-    extras_require = {}
-    if sys.version_info < (3, 4):
-        requires.append('enum34')
-    if sys.version_info < (3, 2):
-        requires.append('configparser')
-
-
-def get_long_description():
-    """Generate a long description from the README file."""
-    descr = []
-    for fname in ('README.rst',):
-        with io.open(fname, encoding='utf-8') as f:
-            descr.append(f.read())
-    return '\n\n'.join(descr)
-
-
-PEP8 = 'pycodestyle'
-_FORMAT = '{0}.{1} = {0}:{1}'
-PEP8_PLUGIN = functools.partial(_FORMAT.format, PEP8)
-
-
-setuptools.setup(
-    name="flake8",
-    license="MIT",
-    version=flake8.__version__,
-    description="the modular source code checker: pep8, pyflakes and co",
-    long_description=get_long_description(),
-    author="Tarek Ziade",
-    author_email="tarek@ziade.org",
-    maintainer="Ian Stapleton Cordasco",
-    maintainer_email="graffatcolmingov@gmail.com",
-    url="https://gitlab.com/pycqa/flake8",
-    package_dir={"": "src"},
-    packages=[
-        "flake8",
-        "flake8.api",
-        "flake8.formatting",
-        "flake8.main",
-        "flake8.options",
-        "flake8.plugins",
-    ],
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
-    install_requires=requires,
-    extras_require=extras_require,
-    entry_points={
-        'distutils.commands': [
-            'flake8 = flake8.main.setuptools_command:Flake8'
-        ],
-        'console_scripts': [
-            'flake8 = flake8.main.cli:main'
-        ],
-        'flake8.extension': [
-            'F = flake8.plugins.pyflakes:FlakesChecker',
-            # PEP-0008 checks provided by PyCQA/pycodestyle
-            PEP8_PLUGIN('tabs_or_spaces'),
-            PEP8_PLUGIN('tabs_obsolete'),
-            PEP8_PLUGIN('trailing_whitespace'),
-            PEP8_PLUGIN('trailing_blank_lines'),
-            PEP8_PLUGIN('maximum_line_length'),
-            PEP8_PLUGIN('blank_lines'),
-            PEP8_PLUGIN('extraneous_whitespace'),
-            PEP8_PLUGIN('whitespace_around_keywords'),
-            PEP8_PLUGIN('missing_whitespace_after_import_keyword'),
-            PEP8_PLUGIN('missing_whitespace'),
-            PEP8_PLUGIN('indentation'),
-            PEP8_PLUGIN('continued_indentation'),
-            PEP8_PLUGIN('whitespace_before_parameters'),
-            PEP8_PLUGIN('whitespace_around_operator'),
-            PEP8_PLUGIN('missing_whitespace_around_operator'),
-            PEP8_PLUGIN('whitespace_around_comma'),
-            PEP8_PLUGIN('whitespace_around_named_parameter_equals'),
-            PEP8_PLUGIN('whitespace_before_comment'),
-            PEP8_PLUGIN('imports_on_separate_lines'),
-            PEP8_PLUGIN('module_imports_on_top_of_file'),
-            PEP8_PLUGIN('compound_statements'),
-            PEP8_PLUGIN('explicit_line_join'),
-            PEP8_PLUGIN('break_after_binary_operator'),
-            PEP8_PLUGIN('break_before_binary_operator'),
-            PEP8_PLUGIN('comparison_to_singleton'),
-            PEP8_PLUGIN('comparison_negative'),
-            PEP8_PLUGIN('comparison_type'),
-            PEP8_PLUGIN('ambiguous_identifier'),
-            PEP8_PLUGIN('bare_except'),
-            PEP8_PLUGIN('maximum_doc_length'),
-            PEP8_PLUGIN('python_3000_has_key'),
-            PEP8_PLUGIN('python_3000_raise_comma'),
-            PEP8_PLUGIN('python_3000_not_equal'),
-            PEP8_PLUGIN('python_3000_backticks'),
-            PEP8_PLUGIN('python_3000_invalid_escape_sequence'),
-            PEP8_PLUGIN('python_3000_async_await_keywords'),
-        ],
-        'flake8.report': [
-            'default = flake8.formatting.default:Default',
-            'pylint = flake8.formatting.default:Pylint',
-            'quiet-filename = flake8.formatting.default:FilenameOnly',
-            'quiet-nothing = flake8.formatting.default:Nothing',
-        ],
-    },
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Environment :: Console",
-        "Framework :: Flake8",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        "Topic :: Software Development :: Quality Assurance",
-    ],
-)
+setuptools.setup()