From f827810fa8396970c68346d622f7f9c9e6bda6b2 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Tue, 12 Jul 2016 21:02:40 -0300 Subject: [PATCH] Fix 2.10 -> 3.0 versions in docs --- doc/en/assert.rst | 2 +- doc/en/capture.rst | 2 +- doc/en/doctest.rst | 2 +- doc/en/usage.rst | 2 +- doc/en/yieldfixture.rst | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/en/assert.rst b/doc/en/assert.rst index bde51fd35..2074cfe53 100644 --- a/doc/en/assert.rst +++ b/doc/en/assert.rst @@ -85,7 +85,7 @@ and if you need to have access to the actual exception info you may use:: the actual exception raised. The main attributes of interest are ``.type``, ``.value`` and ``.traceback``. -.. versionchanged:: 2.10 +.. versionchanged:: 3.0 In the context manager form you may use the keyword argument ``message`` to specify a custom failure message:: diff --git a/doc/en/capture.rst b/doc/en/capture.rst index 0004f5b18..8128419e1 100644 --- a/doc/en/capture.rst +++ b/doc/en/capture.rst @@ -116,7 +116,7 @@ libraries or subprocesses that directly write to operating system level output streams (FD1 and FD2). -.. versionadded:: 2.10 +.. versionadded:: 3.0 To temporarily disable capture within a test, both ``capsys`` and ``capfd`` have a ``disabled()`` method that can be used diff --git a/doc/en/doctest.rst b/doc/en/doctest.rst index 80f5c9506..b9b19cb85 100644 --- a/doc/en/doctest.rst +++ b/doc/en/doctest.rst @@ -105,7 +105,7 @@ itself:: The 'doctest_namespace' fixture ------------------------------- -.. versionadded:: 2.10 +.. versionadded:: 3.0 The ``doctest_namespace`` fixture can be used to inject items into the namespace in which your doctests run. It is intended to be used within diff --git a/doc/en/usage.rst b/doc/en/usage.rst index c2a269a15..351ad526a 100644 --- a/doc/en/usage.rst +++ b/doc/en/usage.rst @@ -204,7 +204,7 @@ This will add an extra property ``example_key="1"`` to the generated LogXML: add_global_property ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -.. versionadded:: 2.10 +.. versionadded:: 3.0 If you want to add a properties node in the testsuite level, which may contains properties that are relevant to all testcases you can use ``LogXML.add_global_properties`` diff --git a/doc/en/yieldfixture.rst b/doc/en/yieldfixture.rst index b372973e5..f69b38eb3 100644 --- a/doc/en/yieldfixture.rst +++ b/doc/en/yieldfixture.rst @@ -3,12 +3,12 @@ "yield_fixture" functions --------------------------------------------------------------- -.. deprecated:: 2.10 +.. deprecated:: 3.0 .. versionadded:: 2.4 .. important:: - Since pytest-2.10, fixtures using the normal ``fixture`` decorator can use a ``yield`` + Since pytest-3.0, fixtures using the normal ``fixture`` decorator can use a ``yield`` statement to provide fixture values and execute teardown code, exactly like ``yield_fixture`` in previous versions.