Merge pull request #11928 from bluetech/setup-cfg-cleanups

Some setup.cfg cleanups

pyproject.toml

@@ -192,3 +192,17 @@ lines-after-imports = 2
 "src/_pytest/_py/**/*.py" = ["B", "PYI"]
 "src/_pytest/_version.py" = ["I001"]
 "testing/python/approx.py" = ["B015"]
+
+[tool.mypy]
+mypy_path = ["src"]
+check_untyped_defs = true
+disallow_any_generics = true
+disallow_untyped_defs = true
+ignore_missing_imports = true
+show_error_codes = true
+strict_equality = true
+warn_redundant_casts = true
+warn_return_any = true
+warn_unreachable = true
+warn_unused_configs = true
+no_implicit_reexport = true

setup.cfg

@@ -33,16 +33,6 @@ project_urls =
     Tracker=https://github.com/pytest-dev/pytest/issues
 
 [options]
-packages =
-    _pytest
-    _pytest._code
-    _pytest._io
-    _pytest._py
-    _pytest.assertion
-    _pytest.config
-    _pytest.mark
-    pytest
-py_modules = py
 install_requires =
     iniconfig
     packaging
@@ -56,7 +46,6 @@ package_dir =
 setup_requires =
     setuptools
     setuptools-scm>=6.0
-zip_safe = no
 
 [options.entry_points]
 console_scripts =
@@ -77,29 +66,3 @@ testing =
 [options.package_data]
 _pytest = py.typed
 pytest = py.typed
-
-[build_sphinx]
-source_dir = doc/en/
-build_dir = doc/build
-all_files = 1
-
-[check-manifest]
-ignore =
-    src/_pytest/_version.py
-
-[devpi:upload]
-formats = sdist.tgz,bdist_wheel
-
-[mypy]
-mypy_path = src
-check_untyped_defs = True
-disallow_any_generics = True
-disallow_untyped_defs = True
-ignore_missing_imports = True
-show_error_codes = True
-strict_equality = True
-warn_redundant_casts = True
-warn_return_any = True
-warn_unreachable = True
-warn_unused_configs = True
-no_implicit_reexport = True