Skip to content

Commit bed56e5

Browse files
committed
Merge pull request #1390 from tomviner/bugfix/docs-typo-plugins
Fix usage of backticks in ReStructured Text files
2 parents 9af1f63 + 3dd50d0 commit bed56e5

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

CHANGELOG.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
``Config.fromdictargs`` now represents its input much more faithfully.
6666
Thanks to `@bukzor`_ for the complete PR (`#680`_).
6767

68-
* Fix (`#1290`_): support Python 3.5's `@` operator in assertion rewriting.
68+
* Fix (`#1290`_): support Python 3.5's ``@`` operator in assertion rewriting.
6969
Thanks `@Shinkenjoe`_ for report with test case and `@tomviner`_ for the PR.
7070

7171
* Fix formatting utf-8 explanation messages (`#1379`_).
@@ -321,10 +321,10 @@
321321
- fix issue768: docstrings found in python modules were not setting up session
322322
fixtures. Thanks Jason R. Coombs for reporting and Bruno Oliveira for the PR.
323323

324-
- added `tmpdir_factory`, a session-scoped fixture that can be used to create
324+
- added ``tmpdir_factory``, a session-scoped fixture that can be used to create
325325
directories under the base temporary directory. Previously this object was
326-
installed as a `_tmpdirhandler` attribute of the `config` object, but now it
327-
is part of the official API and using `config._tmpdirhandler` is
326+
installed as a ``_tmpdirhandler`` attribute of the ``config`` object, but now it
327+
is part of the official API and using ``config._tmpdirhandler`` is
328328
deprecated.
329329
Thanks Bruno Oliveira for the PR.
330330

@@ -353,7 +353,7 @@
353353
or no tests were run at all (related to issue500).
354354
Thanks Eric Siegerman.
355355

356-
- New `testpaths` ini option: list of directories to search for tests
356+
- New ``testpaths`` ini option: list of directories to search for tests
357357
when executing pytest from the root directory. This can be used
358358
to speed up test collection when a project has well specified directories
359359
for tests, being usually more practical than configuring norecursedirs for
@@ -449,20 +449,20 @@
449449
- issue951: add new record_xml_property fixture, that supports logging
450450
additional information on xml output. Thanks David Diaz for the PR.
451451

452-
- issue949: paths after normal options (for example `-s`, `-v`, etc) are now
453-
properly used to discover `rootdir` and `ini` files.
452+
- issue949: paths after normal options (for example ``-s``, ``-v``, etc) are now
453+
properly used to discover ``rootdir`` and ``ini`` files.
454454
Thanks Peter Lauri for the report and Bruno Oliveira for the PR.
455455

456456
2.7.3 (compared to 2.7.2)
457457
=============================
458458

459-
- Allow 'dev', 'rc', or other non-integer version strings in `importorskip`.
459+
- Allow 'dev', 'rc', or other non-integer version strings in ``importorskip``.
460460
Thanks to Eric Hunsberger for the PR.
461461

462462
- fix issue856: consider --color parameter in all outputs (for example
463463
--fixtures). Thanks Barney Gale for the report and Bruno Oliveira for the PR.
464464

465-
- fix issue855: passing str objects as `plugins` argument to pytest.main
465+
- fix issue855: passing str objects as ``plugins`` argument to pytest.main
466466
is now interpreted as a module name to be imported and registered as a
467467
plugin, instead of silently having no effect.
468468
Thanks xmo-odoo for the report and Bruno Oliveira for the PR.
@@ -2097,7 +2097,7 @@ v1.1.1
20972097
- new funcarg: "pytestconfig" is the pytest config object for access
20982098
to command line args and can now be easily used in a test.
20992099

2100-
- install 'py.test' and `py.which` with a ``-$VERSION`` suffix to
2100+
- install ``py.test`` and ``py.which`` with a ``-$VERSION`` suffix to
21012101
disambiguate between Python3, python2.X, Jython and PyPy installed versions.
21022102

21032103
- new "pytestconfig" funcarg allows access to test config object

doc/en/cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ than speed.
262262
config.cache API
263263
------------------
264264

265-
The `config.cache`` object allows other plugins,
265+
The ``config.cache`` object allows other plugins,
266266
including ``conftest.py`` files,
267267
to safely and flexibly store and retrieve values across
268268
test runs because the ``config`` object is available

doc/en/parametrize.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Sometimes you may want to implement your own parametrization scheme
142142
or implement some dynamism for determining the parameters or scope
143143
of a fixture. For this, you can use the ``pytest_generate_tests`` hook
144144
which is called when collecting a test function. Through the passed in
145-
`metafunc` object you can inspect the requesting test context and, most
145+
``metafunc`` object you can inspect the requesting test context and, most
146146
importantly, you can call ``metafunc.parametrize()`` to cause
147147
parametrization.
148148

doc/en/skipping.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Marking a test function to be skipped
3131

3232
.. versionadded:: 2.9
3333

34-
The simplest way to skip a test function is to mark it with the `skip` decorator
34+
The simplest way to skip a test function is to mark it with the ``skip`` decorator
3535
which may be passed an optional ``reason``:
3636

3737
.. code-block:: python
@@ -45,7 +45,7 @@ which may be passed an optional ``reason``:
4545

4646
.. versionadded:: 2.0, 2.4
4747

48-
If you wish to skip something conditionally then you can use `skipif` instead.
48+
If you wish to skip something conditionally then you can use ``skipif`` instead.
4949
Here is an example of marking a test function to be skipped
5050
when run on a Python3.3 interpreter::
5151

doc/en/writing_plugins.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ If you want to write a plugin, there are many real-life examples
109109
you can copy from:
110110

111111
* a custom collection example plugin: :ref:`yaml plugin`
112-
* around 20 doc:`builtin plugins` which provide pytest's own functionality
112+
* around 20 :ref:`builtin plugins` which provide pytest's own functionality
113113
* many `external plugins <http://plugincompat.herokuapp.com>`_ providing additional features
114114

115115
All of these plugins implement the documented `well specified hooks`_

0 commit comments

Comments
 (0)