From 15fe60aa251f70d37f117066db60f88b251b91f7 Mon Sep 17 00:00:00 2001 From: songbowen Date: Sun, 24 Feb 2019 00:24:56 +0800 Subject: [PATCH 1/2] add notice to use [tool:pytest] in setup.cfg --- doc/en/customize.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/en/customize.rst b/doc/en/customize.rst index 310b5c7b3..bcf23b53c 100644 --- a/doc/en/customize.rst +++ b/doc/en/customize.rst @@ -135,6 +135,7 @@ progress output, you can write it into a configuration file: # content of pytest.ini # (or tox.ini or setup.cfg) + # (use [tool:pytest] in setup.cfg cause [pytest] is no longer supported) [pytest] addopts = -ra -q From 3e11bd0d6e3ef8789471f5460e2e81fe97288795 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sat, 23 Feb 2019 15:32:42 -0300 Subject: [PATCH 2/2] Update wording about [tool:pytest] in setup.cfg files --- doc/en/customize.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/en/customize.rst b/doc/en/customize.rst index bcf23b53c..2329ec2d1 100644 --- a/doc/en/customize.rst +++ b/doc/en/customize.rst @@ -133,9 +133,8 @@ progress output, you can write it into a configuration file: .. code-block:: ini - # content of pytest.ini - # (or tox.ini or setup.cfg) - # (use [tool:pytest] in setup.cfg cause [pytest] is no longer supported) + # content of pytest.ini or tox.ini + # setup.cfg files should use [tool:pytest] section instead [pytest] addopts = -ra -q