Merge pull request #1407 from asottile/setup-cfg-fmt

rerun setup-cfg-fmt (and restore comments)

setup.cfg

@@ -1,18 +1,16 @@
-[bdist_wheel]
-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
+long_description_content_type = text/x-rst
+url = https://github.com/pycqa/flake8
 author = Tarek Ziade
 author_email = tarek@ziade.org
 maintainer = Ian Stapleton Cordasco
 maintainer_email = graffatcolmingov@gmail.com
-url = https://github.com/pycqa/flake8
+license = MIT
+license_file = LICENSE
 classifiers =
     Development Status :: 5 - Production/Stable
     Environment :: Console
@@ -21,28 +19,30 @@ classifiers =
     License :: OSI Approved :: MIT License
     Programming Language :: Python
     Programming Language :: Python :: 3
+    Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: Implementation :: PyPy
     Topic :: Software Development :: Libraries :: Python Modules
     Topic :: Software Development :: Quality Assurance
 
 [options]
-package_dir=
-    =src
 packages = find:
-
-install_requires=
+package_dir =
+    =src
 # 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
-    pyflakes >= 2.4.0, < 2.5.0
-    pycodestyle >= 2.8.0, < 2.9.0
-    mccabe >= 0.6.0, < 0.7.0
-    importlib-metadata<4.3; python_version<"3.8"
-
+install_requires =
+    mccabe>=0.6.0,<0.7.0
+    pycodestyle>=2.8.0,<2.9.0
+    pyflakes>=2.4.0,<2.5.0
+    importlib-metadata<4.3;python_version<"3.8"
 python_requires = >=3.6
 
 [options.packages.find]
@@ -95,6 +95,9 @@ flake8.report =
     quiet-filename = flake8.formatting.default:FilenameOnly
     quiet-nothing = flake8.formatting.default:Nothing
 
+[bdist_wheel]
+universal = 1
+
 [mypy]
 check_untyped_defs = true
 disallow_any_generics = true