Merge pull request #7317 from asottile/setup_cfg_fmt

Run setup-py-upgrade and setup-cfg-fmt

.pre-commit-config.yaml

@@ -5,12 +5,12 @@ repos:
     -   id: black
         args: [--safe, --quiet]
 -   repo: https://github.com/asottile/blacken-docs
-    rev: v1.6.0
+    rev: v1.7.0
     hooks:
     -   id: blacken-docs
         additional_dependencies: [black==19.10b0]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.5.0
+    rev: v3.1.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -21,23 +21,29 @@ repos:
         exclude: _pytest/debugging.py
         language_version: python3
 -   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.1
+    rev: 3.8.2
     hooks:
     -   id: flake8
         language_version: python3
         additional_dependencies: [flake8-typing-imports==1.9.0]
 -   repo: https://github.com/asottile/reorder_python_imports
-    rev: v1.4.0
+    rev: v2.3.0
     hooks:
     -   id: reorder-python-imports
         args: ['--application-directories=.:src', --py3-plus]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.2.1
+    rev: v2.4.4
     hooks:
     -   id: pyupgrade
         args: [--py3-plus]
+-   repo: https://github.com/asottile/setup-cfg-fmt
+    rev: v1.9.0
+    hooks:
+    -   id: setup-cfg-fmt
+        # TODO: when upgrading setup-cfg-fmt this can be removed
+        args: [--max-py-version=3.9]
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.770  # NOTE: keep this in sync with setup.py.
+    rev: v0.780  # NOTE: keep this in sync with setup.cfg.
     hooks:
     -   id: mypy
         files: ^(src/|testing/)

setup.cfg

@@ -2,35 +2,35 @@
 name = pytest
 description = pytest: simple powerful testing with Python
 long_description = file: README.rst
+long_description_content_type = text/x-rst
 url = https://docs.pytest.org/en/latest/
-project_urls =
-    Source=https://github.com/pytest-dev/pytest
-    Tracker=https://github.com/pytest-dev/pytest/issues
-
 author = Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others
-
+license = MIT
-license = MIT license
+license_file = LICENSE
-keywords = test, unittest
+platforms = unix, linux, osx, cygwin, win32
 classifiers =
     Development Status :: 6 - Mature
     Intended Audience :: Developers
     License :: OSI Approved :: MIT License
-    Operating System :: POSIX
-    Operating System :: Microsoft :: Windows
     Operating System :: MacOS :: MacOS X
-    Topic :: Software Development :: Testing
+    Operating System :: Microsoft :: Windows
-    Topic :: Software Development :: Libraries
+    Operating System :: POSIX
-    Topic :: Utilities
+    Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
-platforms = unix, linux, osx, cygwin, win32
+    Topic :: Software Development :: Libraries
+    Topic :: Software Development :: Testing
+    Topic :: Utilities
+keywords = test, unittest
+project_urls =
+    Source=https://github.com/pytest-dev/pytest
+    Tracker=https://github.com/pytest-dev/pytest/issues
 
 [options]
-zip_safe = no
 packages =
     _pytest
     _pytest._code
@@ -39,13 +39,40 @@ packages =
     _pytest.config
     _pytest.mark
     pytest
-
+install_requires =
+    attrs>=17.4.0
+    iniconfig
+    more-itertools>=4.0.0
+    packaging
+    pluggy>=0.12,<1.0
+    py>=1.5.0
+    atomicwrites>=1.0;sys_platform=="win32"
+    colorama;sys_platform=="win32"
+    importlib-metadata>=0.12;python_version<"3.8"
+    pathlib2>=2.2.0;python_version<"3.6"
 python_requires = >=3.5
+package_dir =
+    =src
+setup_requires =
+    setuptools>=40.0
+    setuptools-scm
+zip_safe = no
 
 [options.entry_points]
 console_scripts =
-	pytest=pytest:console_main
+    pytest=pytest:console_main
-	py.test=pytest:console_main
+    py.test=pytest:console_main
+
+[options.extras_require]
+checkqa-mypy =
+    mypy==0.780
+testing =
+    argcomplete
+    hypothesis>=3.56
+    mock
+    nose
+    requests
+    xmlschema
 
 [build_sphinx]
 source-dir = doc/en/
@@ -57,7 +84,7 @@ upload-dir = doc/en/build/html
 
 [check-manifest]
 ignore =
-  src/_pytest/_version.py
+    src/_pytest/_version.py
 
 [devpi:upload]
 formats = sdist.tgz,bdist_wheel

setup.py

@@ -1,41 +1,8 @@
 from setuptools import setup
 
-# TODO: if py gets upgrade to >=1.6,
-#       remove _width_of_current_line in terminal.py
-INSTALL_REQUIRES = [
-    "py>=1.5.0",
-    "packaging",
-    "attrs>=17.4.0",  # should match oldattrs tox env.
-    "more-itertools>=4.0.0",
-    'atomicwrites>=1.0;sys_platform=="win32"',
-    'pathlib2>=2.2.0;python_version<"3.6"',
-    'colorama;sys_platform=="win32"',
-    "pluggy>=0.12,<1.0",
-    'importlib-metadata>=0.12;python_version<"3.8"',
-    "iniconfig",
-]
-
 
 def main():
-    setup(
+    setup(use_scm_version={"write_to": "src/_pytest/_version.py"})
-        use_scm_version={"write_to": "src/_pytest/_version.py"},
-        setup_requires=["setuptools-scm", "setuptools>=40.0"],
-        package_dir={"": "src"},
-        extras_require={
-            "testing": [
-                "argcomplete",
-                "hypothesis>=3.56",
-                "mock",
-                "nose",
-                "requests",
-                "xmlschema",
-            ],
-            "checkqa-mypy": [
-                "mypy==v0.770",  # keep this in sync with .pre-commit-config.yaml.
-            ],
-        },
-        install_requires=INSTALL_REQUIRES,
-    )
 
 
 if __name__ == "__main__":