Merge branch 'main' into main

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.1.15"
+  rev: "v0.2.0"
   hooks:
     - id: ruff
       args: ["--fix"]
@@ -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:
@@ -47,6 +42,12 @@ repos:
             # for mypy running on python>=3.11 since exceptiongroup is only a dependency
             # on <3.11
           - exceptiongroup>=1.0.0rc8
+- repo: https://github.com/tox-dev/pyproject-fmt
+  rev: "1.7.0"
+  hooks:
+    - id: pyproject-fmt
+      # https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version
+      additional_dependencies: ["tox>=4.9"]
 -   repo: local
     hooks:
     -   id: rst

pyproject.toml

@@ -1,129 +1,89 @@
-[build-system]
+[project]
-requires = [
+name = "pytest"
-  "setuptools>=45.0",
+description = "pytest: simple powerful testing with Python"
-  "setuptools-scm[toml]>=6.2.3",
+readme = "README.rst"
+keywords = [
+    "test",
+    "unittest",
 ]
+license = {text = "MIT"}
+authors = [
+    {name = "Holger Krekel"},
+    {name = "Bruno Oliveira"},
+    {name = "Ronny Pfannschmidt"},
+    {name = "Floris Bruynooghe"},
+    {name = "Brianna Laugher"},
+    {name = "Florian Bruhin"},
+    {name = "Others (See AUTHORS)"},
+]
+requires-python = ">=3.8"
+classifiers = [
+    "Development Status :: 6 - Mature",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: MacOS",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX",
+    "Operating System :: Unix",
+    "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",
+]
+dynamic = [
+    "version",
+]
+dependencies = [
+    'colorama; sys_platform == "win32"',
+    'exceptiongroup>=1.0.0rc8; python_version < "3.11"',
+    "iniconfig",
+    "packaging",
+    "pluggy<2.0,>=1.4",
+    'tomli>=1; python_version < "3.11"',
+]
+[project.optional-dependencies]
+testing = [
+    "argcomplete",
+    "attrs>=19.2",
+    "hypothesis>=3.56",
+    "mock",
+    "pygments>=2.7.2",
+    "requests",
+    "setuptools",
+    "xmlschema",
+]
+[project.urls]
+Changelog = "https://docs.pytest.org/en/stable/changelog.html"
+Homepage = "https://docs.pytest.org/en/latest/"
+Source = "https://github.com/pytest-dev/pytest"
+Tracker = "https://github.com/pytest-dev/pytest/issues"
+Twitter = "https://twitter.com/pytestdotorg"
+[project.scripts]
+"py.test" = "pytest:console_main"
+pytest = "pytest:console_main"
+
+[build-system]
 build-backend = "setuptools.build_meta"
+requires = [
+    "setuptools>=61",
+    "setuptools-scm[toml]>=6.2.3",
+]
+
+[tool.setuptools.package-data]
+"_pytest" = ["py.typed"]
+"pytest" = ["py.typed"]
 
 [tool.setuptools_scm]
 write_to = "src/_pytest/_version.py"
 
-[tool.pytest.ini_options]
-minversion = "2.0"
-addopts = "-rfEX -p pytester --strict-markers"
-python_files = ["test_*.py", "*_test.py", "testing/python/*.py"]
-python_classes = ["Test", "Acceptance"]
-python_functions = ["test"]
-# NOTE: "doc" is not included here, but gets tested explicitly via "doctesting".
-testpaths = ["testing"]
-norecursedirs = [
-  "testing/example_scripts",
-  ".*",
-  "build",
-  "dist",
-]
-xfail_strict = true
-filterwarnings = [
-    "error",
-    "default:Using or importing the ABCs:DeprecationWarning:unittest2.*",
-    # produced by older pyparsing<=2.2.0.
-    "default:Using or importing the ABCs:DeprecationWarning:pyparsing.*",
-    "default:the imp module is deprecated in favour of importlib:DeprecationWarning:nose.*",
-    # distutils is deprecated in 3.10, scheduled for removal in 3.12
-    "ignore:The distutils package is deprecated:DeprecationWarning",
-    # produced by pytest-xdist
-    "ignore:.*type argument to addoption.*:DeprecationWarning",
-    # produced on execnet (pytest-xdist)
-    "ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning",
-    # pytest's own futurewarnings
-    "ignore::pytest.PytestExperimentalApiWarning",
-    # Do not cause SyntaxError for invalid escape sequences in py37.
-    # Those are caught/handled by pyupgrade, and not easy to filter with the
-    # module being the filename (with .py removed).
-    "default:invalid escape sequence:DeprecationWarning",
-    # ignore not yet fixed warnings for hook markers
-    "default:.*not marked using pytest.hook.*",
-    "ignore:.*not marked using pytest.hook.*::xdist.*",
-    # ignore use of unregistered marks, because we use many to test the implementation
-    "ignore::_pytest.warning_types.PytestUnknownMarkWarning",
-    # https://github.com/benjaminp/six/issues/341
-    "ignore:_SixMetaPathImporter\\.exec_module\\(\\) not found; falling back to load_module\\(\\):ImportWarning",
-    # https://github.com/benjaminp/six/pull/352
-    "ignore:_SixMetaPathImporter\\.find_spec\\(\\) not found; falling back to find_module\\(\\):ImportWarning",
-    # https://github.com/pypa/setuptools/pull/2517
-    "ignore:VendorImporter\\.find_spec\\(\\) not found; falling back to find_module\\(\\):ImportWarning",
-    # https://github.com/pytest-dev/execnet/pull/127
-    "ignore:isSet\\(\\) is deprecated, use is_set\\(\\) instead:DeprecationWarning",
-]
-pytester_example_dir = "testing/example_scripts"
-markers = [
-    # dummy markers for testing
-    "foo",
-    "bar",
-    "baz",
-    # conftest.py reorders tests moving slow ones to the end of the list
-    "slow",
-    # experimental mark for all tests using pexpect
-    "uses_pexpect",
-]
-
-
-[tool.towncrier]
-package = "pytest"
-package_dir = "src"
-filename = "doc/en/changelog.rst"
-directory = "changelog/"
-title_format = "pytest {version} ({project_date})"
-template = "changelog/_template.rst"
-
-  [[tool.towncrier.type]]
-  directory = "breaking"
-  name = "Breaking Changes"
-  showcontent = true
-
-  [[tool.towncrier.type]]
-  directory = "deprecation"
-  name = "Deprecations"
-  showcontent = true
-
-  [[tool.towncrier.type]]
-  directory = "feature"
-  name = "Features"
-  showcontent = true
-
-  [[tool.towncrier.type]]
-  directory = "improvement"
-  name = "Improvements"
-  showcontent = true
-
-  [[tool.towncrier.type]]
-  directory = "bugfix"
-  name = "Bug Fixes"
-  showcontent = true
-
-  [[tool.towncrier.type]]
-  directory = "vendor"
-  name = "Vendored Libraries"
-  showcontent = true
-
-  [[tool.towncrier.type]]
-  directory = "doc"
-  name = "Improved Documentation"
-  showcontent = true
-
-  [[tool.towncrier.type]]
-  directory = "trivial"
-  name = "Trivial/Internal Changes"
-  showcontent = true
-
 [tool.black]
 target-version = ['py38']
 
-# check-wheel-contents is executed by the build-and-inspect-python-package action.
-[tool.check-wheel-contents]
-# W009: Wheel contains multiple toplevel library entries
-ignore = "W009"
-
 [tool.ruff]
 src = ["src"]
 line-length = 88
@@ -193,6 +153,121 @@ lines-after-imports = 2
 "src/_pytest/_version.py" = ["I001"]
 "testing/python/approx.py" = ["B015"]
 
+[tool.check-wheel-contents]
+# check-wheel-contents is executed by the build-and-inspect-python-package action.
+# W009: Wheel contains multiple toplevel library entries
+ignore = "W009"
+
+[tool.pyproject-fmt]
+indent = 4
+
+[tool.pytest.ini_options]
+minversion = "2.0"
+addopts = "-rfEX -p pytester --strict-markers"
+python_files = ["test_*.py", "*_test.py", "testing/python/*.py"]
+python_classes = ["Test", "Acceptance"]
+python_functions = ["test"]
+# NOTE: "doc" is not included here, but gets tested explicitly via "doctesting".
+testpaths = ["testing"]
+norecursedirs = [
+  "testing/example_scripts",
+  ".*",
+  "build",
+  "dist",
+]
+xfail_strict = true
+filterwarnings = [
+    "error",
+    "default:Using or importing the ABCs:DeprecationWarning:unittest2.*",
+    # produced by older pyparsing<=2.2.0.
+    "default:Using or importing the ABCs:DeprecationWarning:pyparsing.*",
+    "default:the imp module is deprecated in favour of importlib:DeprecationWarning:nose.*",
+    # distutils is deprecated in 3.10, scheduled for removal in 3.12
+    "ignore:The distutils package is deprecated:DeprecationWarning",
+    # produced by pytest-xdist
+    "ignore:.*type argument to addoption.*:DeprecationWarning",
+    # produced on execnet (pytest-xdist)
+    "ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning",
+    # pytest's own futurewarnings
+    "ignore::pytest.PytestExperimentalApiWarning",
+    # Do not cause SyntaxError for invalid escape sequences in py37.
+    # Those are caught/handled by pyupgrade, and not easy to filter with the
+    # module being the filename (with .py removed).
+    "default:invalid escape sequence:DeprecationWarning",
+    # ignore not yet fixed warnings for hook markers
+    "default:.*not marked using pytest.hook.*",
+    "ignore:.*not marked using pytest.hook.*::xdist.*",
+    # ignore use of unregistered marks, because we use many to test the implementation
+    "ignore::_pytest.warning_types.PytestUnknownMarkWarning",
+    # https://github.com/benjaminp/six/issues/341
+    "ignore:_SixMetaPathImporter\\.exec_module\\(\\) not found; falling back to load_module\\(\\):ImportWarning",
+    # https://github.com/benjaminp/six/pull/352
+    "ignore:_SixMetaPathImporter\\.find_spec\\(\\) not found; falling back to find_module\\(\\):ImportWarning",
+    # https://github.com/pypa/setuptools/pull/2517
+    "ignore:VendorImporter\\.find_spec\\(\\) not found; falling back to find_module\\(\\):ImportWarning",
+    # https://github.com/pytest-dev/execnet/pull/127
+    "ignore:isSet\\(\\) is deprecated, use is_set\\(\\) instead:DeprecationWarning",
+]
+pytester_example_dir = "testing/example_scripts"
+markers = [
+    # dummy markers for testing
+    "foo",
+    "bar",
+    "baz",
+    # conftest.py reorders tests moving slow ones to the end of the list
+    "slow",
+    # experimental mark for all tests using pexpect
+    "uses_pexpect",
+]
+
+[tool.towncrier]
+package = "pytest"
+package_dir = "src"
+filename = "doc/en/changelog.rst"
+directory = "changelog/"
+title_format = "pytest {version} ({project_date})"
+template = "changelog/_template.rst"
+
+  [[tool.towncrier.type]]
+  directory = "breaking"
+  name = "Breaking Changes"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "deprecation"
+  name = "Deprecations"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "feature"
+  name = "Features"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "improvement"
+  name = "Improvements"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "bugfix"
+  name = "Bug Fixes"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "vendor"
+  name = "Vendored Libraries"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "doc"
+  name = "Improved Documentation"
+  showcontent = true
+
+  [[tool.towncrier.type]]
+  directory = "trivial"
+  name = "Trivial/Internal Changes"
+  showcontent = true
+
 [tool.mypy]
 mypy_path = ["src"]
 check_untyped_defs = true

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