Merge pull request #1719 from nicoddemus/fix-2.10-versions-in-docs

Fix 2.10 -> 3.0 versions in docs
This commit is contained in:
Florian Bruhin 2016-07-13 08:10:13 +02:00 committed by GitHub
commit 54ea27c283
5 changed files with 6 additions and 6 deletions

View File

@ -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::

View File

@ -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

View File

@ -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

View File

@ -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``

View File

@ -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.