Skip to content

Commit 54ea27c

Browse files
authored
Merge pull request #1719 from nicoddemus/fix-2.10-versions-in-docs
Fix 2.10 -> 3.0 versions in docs
2 parents c4f20a1 + f827810 commit 54ea27c

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

doc/en/assert.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ and if you need to have access to the actual exception info you may use::
8585
the actual exception raised. The main attributes of interest are
8686
``.type``, ``.value`` and ``.traceback``.
8787

88-
.. versionchanged:: 2.10
88+
.. versionchanged:: 3.0
8989

9090
In the context manager form you may use the keyword argument
9191
``message`` to specify a custom failure message::

doc/en/capture.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ libraries or subprocesses that directly write to operating
116116
system level output streams (FD1 and FD2).
117117

118118

119-
.. versionadded:: 2.10
119+
.. versionadded:: 3.0
120120

121121
To temporarily disable capture within a test, both ``capsys``
122122
and ``capfd`` have a ``disabled()`` method that can be used

doc/en/doctest.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ itself::
105105
The 'doctest_namespace' fixture
106106
-------------------------------
107107

108-
.. versionadded:: 2.10
108+
.. versionadded:: 3.0
109109

110110
The ``doctest_namespace`` fixture can be used to inject items into the
111111
namespace in which your doctests run. It is intended to be used within

doc/en/usage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ This will add an extra property ``example_key="1"`` to the generated
204204
LogXML: add_global_property
205205
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
206206

207-
.. versionadded:: 2.10
207+
.. versionadded:: 3.0
208208

209209
If you want to add a properties node in the testsuite level, which may contains properties that are relevant
210210
to all testcases you can use ``LogXML.add_global_properties``

doc/en/yieldfixture.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"yield_fixture" functions
44
---------------------------------------------------------------
55

6-
.. deprecated:: 2.10
6+
.. deprecated:: 3.0
77

88
.. versionadded:: 2.4
99

1010
.. important::
11-
Since pytest-2.10, fixtures using the normal ``fixture`` decorator can use a ``yield``
11+
Since pytest-3.0, fixtures using the normal ``fixture`` decorator can use a ``yield``
1212
statement to provide fixture values and execute teardown code, exactly like ``yield_fixture``
1313
in previous versions.
1414

0 commit comments

Comments
 (0)