From 66cfc66d63f428342f5cfbd6b3c7e4c7c9b9fcde Mon Sep 17 00:00:00 2001 From: Xixi Zhao Date: Mon, 22 Jul 2019 16:01:56 +0800 Subject: [PATCH 1/3] Update index.rst --- doc/en/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/en/index.rst b/doc/en/index.rst index 2d6ea620f..6c7c84865 100644 --- a/doc/en/index.rst +++ b/doc/en/index.rst @@ -61,7 +61,7 @@ Features - Can run :ref:`unittest ` (including trial) and :ref:`nose ` test suites out of the box; -- Python Python 3.5+ and PyPy 3; +- Python 3.5+ and PyPy 3; - Rich plugin architecture, with over 315+ `external plugins `_ and thriving community; From 6e687c4354f5bb6dd156e2a7fc54c79428962826 Mon Sep 17 00:00:00 2001 From: Xixi Zhao Date: Tue, 23 Jul 2019 15:09:32 +0800 Subject: [PATCH 2/3] Doc fix: m1 isn't a dependency of f1. According to the file in `example/fixtures/test_fixtures_order.py`, m1 isn't a dependency of f1. --- doc/en/fixture.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/en/fixture.rst b/doc/en/fixture.rst index 78fef13e8..d6c7bfd4d 100644 --- a/doc/en/fixture.rst +++ b/doc/en/fixture.rst @@ -307,7 +307,6 @@ The fixtures requested by ``test_foo`` will be instantiated in the following ord 1. ``s1``: is the highest-scoped fixture (``session``). 2. ``m1``: is the second highest-scoped fixture (``module``). - because it is a dependency of ``f1``. 3. ``a1``: is a ``function``-scoped ``autouse`` fixture: it will be instantiated before other fixtures within the same scope. 4. ``f3``: is a ``function``-scoped fixture, required by ``f1``: it needs to be instantiated at this point @@ -501,7 +500,7 @@ of a fixture is needed multiple times in a single test. Instead of returning data directly, the fixture instead returns a function which generates the data. This function can then be called multiple times in the test. -Factories can have have parameters as needed:: +Factories can have parameters as needed:: @pytest.fixture def make_customer_record(): From 1d8f668e100ff5d0af0f9d4f49947b883938ab7a Mon Sep 17 00:00:00 2001 From: helloocc Date: Wed, 24 Jul 2019 23:44:37 +0800 Subject: [PATCH 3/3] Add author. --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 8e2314283..8e545e126 100644 --- a/AUTHORS +++ b/AUTHORS @@ -258,6 +258,7 @@ Wil Cooley William Lee Wim Glenn Wouter van Ackooy +Xixi Zhao Xuan Luong Xuecong Liao Zac Hatfield-Dodds