From c27350e60c295716caf9cb078a75cb6dce986cbc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 08:12:30 -0300 Subject: [PATCH] [7.2.x] Include `pyproject.toml` in help section that lists out config files with ini-options (#10808) Co-authored-by: Stefanie Molin <24376333+stefmolin@users.noreply.github.com> --- AUTHORS | 1 + doc/en/reference/reference.rst | 2 +- src/_pytest/helpconfig.py | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 6873de941..c29bce341 100644 --- a/AUTHORS +++ b/AUTHORS @@ -327,6 +327,7 @@ Srinivas Reddy Thatiparthy Stefan Farmbauer Stefan Scherfke Stefan Zimmermann +Stefanie Molin Stefano Taschini Steffen Allner Stephan Obermann diff --git a/doc/en/reference/reference.rst b/doc/en/reference/reference.rst index bbad27e09..a336fb8cc 100644 --- a/doc/en/reference/reference.rst +++ b/doc/en/reference/reference.rst @@ -1961,7 +1961,7 @@ All the command-line flags can be obtained by running ``pytest --help``:: Auto-indent multiline messages passed to the logging module. Accepts true|on, false|off or an integer. - [pytest] ini-options in the first pytest.ini|tox.ini|setup.cfg file found: + [pytest] ini-options in the first pytest.ini|tox.ini|setup.cfg|pyproject.toml file found: markers (linelist): Markers for test functions empty_parameter_set_mark (string): diff --git a/src/_pytest/helpconfig.py b/src/_pytest/helpconfig.py index 151bc6dff..6b6718a70 100644 --- a/src/_pytest/helpconfig.py +++ b/src/_pytest/helpconfig.py @@ -164,7 +164,8 @@ def showhelp(config: Config) -> None: tw.write(config._parser.optparser.format_help()) tw.line() tw.line( - "[pytest] ini-options in the first pytest.ini|tox.ini|setup.cfg file found:" + "[pytest] ini-options in the first " + "pytest.ini|tox.ini|setup.cfg|pyproject.toml file found:" ) tw.line()