1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/changeset/a6b5be9d2809/ changeset: a6b5be9d2809 user: hpk42 date: 2012-06-11 16:24:42 summary: fix ReST errors, increment doc-version and push to pytest.org affected #: 3 files diff -r 3bdb19989d5e3244730305cd570963b94c7599fe -r a6b5be9d280994ebb5eda37c38b3ff9c17963772 doc/en/conf.py --- a/doc/en/conf.py +++ b/doc/en/conf.py @@ -11,6 +11,14 @@ # All configuration values have a default; values that are commented out # serve to show the default. +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The full version, including alpha/beta/rc tags. +# The short X.Y version. +version = release = "2.2.4.2" + import sys, os # If extensions (or modules to document with autodoc) are in another directory, @@ -44,13 +52,6 @@ project = u'pytest' copyright = u'2011, holger krekel et alii' -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The full version, including alpha/beta/rc tags. -# The short X.Y version. -version = release = "2.2.4.1" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff -r 3bdb19989d5e3244730305cd570963b94c7599fe -r a6b5be9d280994ebb5eda37c38b3ff9c17963772 doc/en/example/markers.txt --- a/doc/en/example/markers.txt +++ b/doc/en/example/markers.txt @@ -262,11 +262,11 @@ .. versionadded: 2.2.2 +.. regendoc:wipe + If you are heavily using markers in your test suite you may encounter the case where a marker is applied several times to a test function. From plugin code you can read over all such settings. Example:: -.. regendoc:wipe - # content of test_mark_three_times.py import pytest pytestmark = pytest.mark.glob("module", x=1) @@ -303,14 +303,14 @@ marking platform specific tests with pytest -------------------------------------------------------------- +.. regendoc:wipe + Consider you have a test suite which marks tests for particular platforms, namely ``pytest.mark.osx``, ``pytest.mark.win32`` etc. and you also have tests that run on all platforms and have no specific marker. If you now want to have a way to only run the tests for your particular platform, you could use the following plugin:: -.. regendoc:wipe - # content of conftest.py # import sys diff -r 3bdb19989d5e3244730305cd570963b94c7599fe -r a6b5be9d280994ebb5eda37c38b3ff9c17963772 doc/en/example/pythoncollection.txt --- a/doc/en/example/pythoncollection.txt +++ b/doc/en/example/pythoncollection.txt @@ -93,7 +93,7 @@ ============================= in 0.00 seconds ============================= -customizing test collection to find all *.py files +customizing test collection to find all .py files --------------------------------------------------------- .. regendoc:wipe Repository URL: https://bitbucket.org/hpk42/pytest/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ py-svn mailing list py-svn@codespeak.net http://codespeak.net/mailman/listinfo/py-svn
