Merge pull request #11930 from Pierre-Sassoulas/setup.cfg-to-pyproject.toml

Migration from ``setup.cfg`` to ``pyproject.toml``

.pre-commit-config.yaml

@@ -21,11 +21,6 @@ repos:
     hooks:
     -   id: blacken-docs
         additional_dependencies: [black==24.1.1]
--   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.5.0
-    hooks:
-    -   id: setup-cfg-fmt
-        args: ["--max-py-version=3.12", "--include-version-classifiers"]
 -   repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0
     hooks:

pyproject.toml

@@ -1,3 +1,72 @@
+[project]
+name = "pytest"
+dynamic = ["version"]
+description = "pytest: simple powerful testing with Python"
+authors = [
+    {name = "Holger Krekel"},
+    {name = "Bruno Oliveira"},
+    {name = "Ronny Pfannschmidt"},
+    {name = "Floris Bruynooghe"},
+    {name = "Brianna Laugher"},
+    {name = "Florian Bruhin"},
+    {name = "Others (See AUTHORS)"},
+]
+readme = "README.rst"
+license = {text = "MIT"}
+keywords = ["test", "unittest"]
+classifiers = [
+    "Development Status :: 6 - Mature",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: MacOS",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: Unix",
+    "Operating System :: POSIX",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Topic :: Software Development :: Libraries",
+    "Topic :: Software Development :: Testing",
+    "Topic :: Utilities",
+]
+
+dependencies = [
+    "colorama;sys_platform=='win32'",
+    "exceptiongroup>=1.0.0rc8;python_version<'3.11'",
+    "iniconfig",
+    "packaging",
+    "pluggy>=1.4.0,<2.0",
+    "tomli>=1.0.0;python_version<'3.11'",
+]
+requires-python = ">=3.8"
+
+[project.optional-dependencies]
+testing = [
+    "argcomplete",
+    "attrs>=19.2.0",
+    "hypothesis>=3.56",
+    "mock",
+    "pygments>=2.7.2",
+    "requests",
+    "setuptools",
+    "xmlschema",
+]
+
+[project.scripts]
+"py.test" = "pytest:console_main"
+pytest = "pytest:console_main"
+
+[project.urls]
+Homepage = "https://docs.pytest.org/en/latest/"
+Changelog = "https://docs.pytest.org/en/stable/changelog.html"
+Twitter = "https://twitter.com/pytestdotorg"
+Source = "https://github.com/pytest-dev/pytest"
+Tracker = "https://github.com/pytest-dev/pytest/issues"
+
 [build-system]
 requires = [
   "setuptools>=45.0",
@@ -5,6 +74,10 @@ requires = [
 ]
 build-backend = "setuptools.build_meta"
 
+[tool.setuptools.package-data]
+"_pytest" = ["py.typed"]
+"pytest" = ["py.typed"]
+
 [tool.setuptools_scm]
 write_to = "src/_pytest/_version.py"
 

setup.cfg

@@ -1,68 +0,0 @@
-[metadata]
-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/
-author = Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others
-license = MIT
-license_files = LICENSE
-platforms = unix, linux, osx, cygwin, win32
-classifiers =
-    Development Status :: 6 - Mature
-    Intended Audience :: Developers
-    License :: OSI Approved :: MIT License
-    Operating System :: MacOS :: MacOS X
-    Operating System :: Microsoft :: Windows
-    Operating System :: POSIX
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
-    Programming Language :: Python :: 3.12
-    Topic :: Software Development :: Libraries
-    Topic :: Software Development :: Testing
-    Topic :: Utilities
-keywords = test, unittest
-project_urls =
-    Changelog=https://docs.pytest.org/en/stable/changelog.html
-    Twitter=https://twitter.com/pytestdotorg
-    Source=https://github.com/pytest-dev/pytest
-    Tracker=https://github.com/pytest-dev/pytest/issues
-
-[options]
-install_requires =
-    iniconfig
-    packaging
-    pluggy>=1.4.0,<2.0
-    colorama;sys_platform=="win32"
-    exceptiongroup>=1.0.0rc8;python_version<"3.11"
-    tomli>=1.0.0;python_version<"3.11"
-python_requires = >=3.8
-package_dir =
-    =src
-setup_requires =
-    setuptools
-    setuptools-scm>=6.0
-
-[options.entry_points]
-console_scripts =
-    pytest=pytest:console_main
-    py.test=pytest:console_main
-
-[options.extras_require]
-testing =
-    argcomplete
-    attrs>=19.2.0
-    hypothesis>=3.56
-    mock
-    pygments>=2.7.2
-    requests
-    setuptools
-    xmlschema
-
-[options.package_data]
-_pytest = py.typed
-pytest = py.typed