[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

pyproject.toml

@@ -72,11 +72,11 @@ urls.Tracker = "https://github.com/pytest-dev/pytest/issues"
 scripts."py.test" = "pytest:console_main"
 scripts.pytest = "pytest:console_main"
 
-[tool.setuptools.package-data]
-"_pytest" = [
+[tool.setuptools]
+package-data."_pytest" = [
     "py.typed",
 ]
-"pytest" = [
+package-data."pytest" = [
     "py.typed",
 ]
 
@@ -116,31 +116,31 @@ lint.select = [
 ]
 lint.ignore = [
     # bugbear ignore
-    "B004", # Using `hasattr(x, "__call__")` to test if x is callable is unreliable.
-    "B007", # Loop control variable `i` not used within loop body
-    "B009", # Do not call `getattr` with a constant attribute value
-    "B010", # [*] Do not call `setattr` with a constant attribute value.
-    "B011", # Do not `assert False` (`python -O` removes these calls)
-    "B028", # No explicit `stacklevel` keyword argument found
+    "B004",    # Using `hasattr(x, "__call__")` to test if x is callable is unreliable.
+    "B007",    # Loop control variable `i` not used within loop body
+    "B009",    # Do not call `getattr` with a constant attribute value
+    "B010",    # [*] Do not call `setattr` with a constant attribute value.
+    "B011",    # Do not `assert False` (`python -O` removes these calls)
+    "B028",    # No explicit `stacklevel` keyword argument found
     # pydocstyle ignore
-    "D100", # Missing docstring in public module
-    "D101", # Missing docstring in public class
-    "D102", # Missing docstring in public method
-    "D103", # Missing docstring in public function
-    "D104", # Missing docstring in public package
-    "D105", # Missing docstring in magic method
-    "D106", # Missing docstring in public nested class
-    "D107", # Missing docstring in `__init__`
-    "D205", # 1 blank line required between summary line and description
-    "D209", # [*] Multi-line docstring closing quotes should be on a separate line
-    "D400", # First line should end with a period
-    "D401", # First line of docstring should be in imperative mood
-    "D402", # First line should not be the function's signature
-    "D404", # First word of the docstring should not be "This"
-    "D415", # First line should end with a period, question mark, or exclamation point
+    "D100",    # Missing docstring in public module
+    "D101",    # Missing docstring in public class
+    "D102",    # Missing docstring in public method
+    "D103",    # Missing docstring in public function
+    "D104",    # Missing docstring in public package
+    "D105",    # Missing docstring in magic method
+    "D106",    # Missing docstring in public nested class
+    "D107",    # Missing docstring in `__init__`
+    "D205",    # 1 blank line required between summary line and description
+    "D209",    # [*] Multi-line docstring closing quotes should be on a separate line
+    "D400",    # First line should end with a period
+    "D401",    # First line of docstring should be in imperative mood
+    "D402",    # First line should not be the function's signature
+    "D404",    # First word of the docstring should not be "This"
+    "D415",    # First line should end with a period, question mark, or exclamation point
     # pytest can do weird low-level things, and we usually know
     # what we're doing when we use type(..) is ...
-    "E721", # Do not compare types, use `isinstance()`
+    "E721",    # Do not compare types, use `isinstance()`
     # pylint ignore
     "PLC0105", # `TypeVar` name "E" does not reflect its covariance;
     "PLC0414", # Import alias does not rename original package
@@ -160,7 +160,7 @@ lint.ignore = [
     "PLW1641", # Does not implement the __hash__ method
     "PLW2901", # for loop variable overwritten by assignment target
     # ruff ignore
-    "RUF012", # Mutable class attributes should be annotated with `typing.ClassVar`
+    "RUF012",  # Mutable class attributes should be annotated with `typing.ClassVar`
 ]
 lint.per-file-ignores."src/_pytest/_py/**/*.py" = [
     "B",
@@ -197,10 +197,10 @@ lint.pycodestyle.max-line-length = 120
 lint.pydocstyle.convention = "pep257"
 lint.pyupgrade.keep-runtime-typing = false
 
-[tool.pylint.main]
+[tool.pylint]
 # Maximum number of characters on a single line.
-max-line-length = 120
-disable = [
+main.max-line-length = 120
+main.disable = [
     "abstract-method",
     "arguments-differ",
     "arguments-renamed",
@@ -380,39 +380,39 @@ norecursedirs = [
 ]
 strict = true
 filterwarnings = [
-    'error',
-    'default:Using or importing the ABCs:DeprecationWarning:unittest2.*',
+    "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.*',
+    "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',
+    "ignore:The distutils package is deprecated:DeprecationWarning",
     # produced by pytest-xdist
-    'ignore:.*type argument to addoption.*:DeprecationWarning',
+    "ignore:.*type argument to addoption.*:DeprecationWarning",
     # produced on execnet (pytest-xdist)
-    'ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning',
+    "ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning",
     # pytest's own futurewarnings
-    'ignore::pytest.PytestExperimentalApiWarning',
+    "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',
+    "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.*',
+    "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',
+    "ignore::_pytest.warning_types.PytestUnknownMarkWarning",
     # https://github.com/benjaminp/six/issues/341
-    'ignore:_SixMetaPathImporter\.exec_module\(\) not found; falling back to load_module\(\):ImportWarning',
+    "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',
+    "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',
+    "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',
+    "ignore:isSet\\(\\) is deprecated, use is_set\\(\\) instead:DeprecationWarning",
     # https://github.com/pytest-dev/pytest/issues/2366
     # https://github.com/pytest-dev/pytest/pull/13057
-    'default::pytest.PytestFDWarning',
+    "default::pytest.PytestFDWarning",
 ]
 pytester_example_dir = "testing/example_scripts"
 markers = [
@@ -432,47 +432,43 @@ markers = [
     "keep_ci_var",
 ]
 
-[tool.coverage.paths]
-source = [
-    'src/',
-    '*/lib/python*/site-packages/',
-    '*/pypy*/site-packages/',
-    '*\Lib\site-packages\',
-]
-
-[tool.coverage.report]
-skip_covered = true
-show_missing = true
-exclude_lines = [
-    '\#\s*pragma: no cover',
-    '^\s*raise NotImplementedError\b',
-    '^\s*return NotImplemented\b',
-    '^\s*assert False(,|$)',
-    '^\s*case unreachable:',
-    '^\s*assert_never\(',
-    '^\s*if TYPE_CHECKING:',
-    '^\s*@overload( |$)',
-    '^\s*def .+: \.\.\.$',
-    '^\s*@pytest\.mark\.xfail',
-]
-
-[tool.coverage.run]
-include = [
-    'src/*',
-    'testing/*',
-    '*/lib/python*/site-packages/_pytest/*',
-    '*/lib/python*/site-packages/pytest.py',
-    '*/pypy*/site-packages/_pytest/*',
-    '*/pypy*/site-packages/pytest.py',
-    '*\Lib\site-packages\_pytest\*',
-    '*\Lib\site-packages\pytest.py',
-]
-parallel = true
-branch = true
-patch = [ "subprocess" ]
+[tool.coverage]
+run.branch = true
 # The sysmon core (default since Python 3.14) is much slower.
 # Perhaps: https://github.com/coveragepy/coveragepy/issues/2082
-core = "ctrace"
+run.core = "ctrace"
+run.include = [
+    "*/lib/python*/site-packages/_pytest/*",
+    "*/lib/python*/site-packages/pytest.py",
+    "*/pypy*/site-packages/_pytest/*",
+    "*/pypy*/site-packages/pytest.py",
+    "*\\Lib\\site-packages\\_pytest\\*",
+    "*\\Lib\\site-packages\\pytest.py",
+    "src/*",
+    "testing/*",
+]
+run.parallel = true
+run.patch = [ "subprocess" ]
+paths.source = [
+    "src/",
+    "*/lib/python*/site-packages/",
+    "*/pypy*/site-packages/",
+    "*\\Lib\\site-packages\\",
+]
+report.exclude_lines = [
+    "\\#\\s*pragma: no cover",
+    "^\\s*@overload( |$)",
+    "^\\s*@pytest\\.mark\\.xfail",
+    "^\\s*assert False(,|$)",
+    "^\\s*assert_never\\(",
+    "^\\s*case unreachable:",
+    "^\\s*def .+: \\.\\.\\.$",
+    "^\\s*if TYPE_CHECKING:",
+    "^\\s*raise NotImplementedError\\b",
+    "^\\s*return NotImplemented\\b",
+]
+report.show_missing = true
+report.skip_covered = true
 
 [tool.towncrier]
 package = "pytest"
@@ -481,76 +477,37 @@ filename = "doc/en/changelog.rst"
 directory = "changelog/"
 title_format = "pytest {version} ({project_date})"
 template = "changelog/_template.rst"
-
-# NOTE: The types are declared because:
-# NOTE: - there is no mechanism to override just the value of
-# NOTE:   `tool.towncrier.type.misc.showcontent`;
-# NOTE: - and, we want to declare extra non-default types for
-# NOTE:   clarity and flexibility.
-
-[[tool.towncrier.type]]
-# When something public gets removed in a breaking way. Could be
-# deprecated in an earlier release.
-directory = "breaking"
-name = "Removals and backward incompatible breaking changes"
-showcontent = true
-
-[[tool.towncrier.type]]
-# Declarations of future API removals and breaking changes in behavior.
-directory = "deprecation"
-name = "Deprecations (removal in next major release)"
-showcontent = true
-
-[[tool.towncrier.type]]
-# New behaviors, public APIs. That sort of stuff.
-directory = "feature"
-name = "New features"
-showcontent = true
-
-[[tool.towncrier.type]]
-# New behaviors in existing features.
-directory = "improvement"
-name = "Improvements in existing functionality"
-showcontent = true
-
-[[tool.towncrier.type]]
-# Something we deemed an improper undesired behavior that got corrected
-# in the release to match pre-agreed expectations.
-directory = "bugfix"
-name = "Bug fixes"
-showcontent = true
-
-[[tool.towncrier.type]]
-# Updates regarding bundling dependencies.
-directory = "vendor"
-name = "Vendored libraries"
-showcontent = true
-
-[[tool.towncrier.type]]
-# Notable updates to the documentation structure or build process.
-directory = "doc"
-name = "Improved documentation"
-showcontent = true
-
-[[tool.towncrier.type]]
-# Notes for downstreams about unobvious side effects and tooling. Changes
-# in the test invocation considerations and runtime assumptions.
-directory = "packaging"
-name = "Packaging updates and notes for downstreams"
-showcontent = true
-
-[[tool.towncrier.type]]
-# Stuff that affects the contributor experience. e.g. Running tests,
-# building the docs, setting up the development environment.
-directory = "contrib"
-name = "Contributor-facing changes"
-showcontent = true
-
-[[tool.towncrier.type]]
-# Changes that are hard to assign to any of the above categories.
-directory = "misc"
-name = "Miscellaneous internal changes"
-showcontent = true
+type = [
+    # NOTE: The types are declared because:
+    # NOTE: - there is no mechanism to override just the value of
+    # NOTE:   `tool.towncrier.type.misc.showcontent`;
+    # NOTE: - and, we want to declare extra non-default types for
+    # NOTE:   clarity and flexibility.
+    # When something public gets removed in a breaking way. Could be
+    # deprecated in an earlier release.
+    { directory = "breaking", name = "Removals and backward incompatible breaking changes", showcontent = true },
+    # Declarations of future API removals and breaking changes in behavior.
+    { directory = "deprecation", name = "Deprecations (removal in next major release)", showcontent = true },
+    # New behaviors, public APIs. That sort of stuff.
+    { directory = "feature", name = "New features", showcontent = true },
+    # New behaviors in existing features.
+    { directory = "improvement", name = "Improvements in existing functionality", showcontent = true },
+    # Something we deemed an improper undesired behavior that got corrected
+    # in the release to match pre-agreed expectations.
+    { directory = "bugfix", name = "Bug fixes", showcontent = true },
+    # Updates regarding bundling dependencies.
+    { directory = "vendor", name = "Vendored libraries", showcontent = true },
+    # Notable updates to the documentation structure or build process.
+    { directory = "doc", name = "Improved documentation", showcontent = true },
+    # Notes for downstreams about unobvious side effects and tooling. Changes
+    # in the test invocation considerations and runtime assumptions.
+    { directory = "packaging", name = "Packaging updates and notes for downstreams", showcontent = true },
+    # Stuff that affects the contributor experience. e.g. Running tests,
+    # building the docs, setting up the development environment.
+    { directory = "contrib", name = "Contributor-facing changes", showcontent = true },
+    # Changes that are hard to assign to any of the above categories.
+    { directory = "misc", name = "Miscellaneous internal changes", showcontent = true },
+]
 
 [tool.mypy]
 files = [

src/_pytest/config/findpaths.py

@@ -233,7 +233,7 @@ def is_option(x: str) -> bool:
         return x.startswith("-")
 
     def get_file_part_from_node_id(x: str) -> str:
-        return x.split("::")[0]
+        return x.split("::", maxsplit=1)[0]
 
     def get_dir_from_path(path: Path) -> Path:
         if path.is_dir():

src/_pytest/terminal.py

@@ -476,7 +476,7 @@ def hasopt(self, char: str) -> bool:
         return char in self.reportchars
 
     def write_fspath_result(self, nodeid: str, res: str, **markup: bool) -> None:
-        fspath = self.config.rootpath / nodeid.split("::")[0]
+        fspath = self.config.rootpath / nodeid.split("::", maxsplit=1)[0]
         if self.currentfspath is None or fspath != self.currentfspath:
             if self.currentfspath is not None and self._show_progress_info:
                 self._write_progress_information_filling_space()
@@ -1034,7 +1034,9 @@ def mkrel(nodeid: str) -> str:
         # fspath comes from testid which has a "/"-normalized path.
         if fspath:
             res = mkrel(nodeid)
-            if self.verbosity >= 2 and nodeid.split("::")[0] != nodes.norm_sep(fspath):
+            if self.verbosity >= 2 and nodeid.split("::", maxsplit=1)[
+                0
+            ] != nodes.norm_sep(fspath):
                 res += " <- " + bestrelpath(self.startpath, Path(fspath))
         else:
             res = "[location]"