[Pytest-commit] commit/pytest: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in pytest:

https://bitbucket.org/hpk42/pytest/commits/29f985647e12/
Changeset:   29f985647e12
Branch:      dirn/adjust-syntax-for-parametrize-documentat-1380671670976
User:        dirn
Date:        2013-10-02 01:54:34
Summary:     Adjust syntax for parametrize documentation

Without the double colon, reStructuredText won't display treat the block that
follows as pre-formatted text. Also, with this change comes the need to change a
tab to spaces to align it with the adjacent lines.
Affected #:  1 file

diff -r 8124b841c6ca8c40963d4650143c32304932a3ec -r 29f985647e123d9f236b011abdbfebbc22da814d doc/en/skipping.txt
--- a/doc/en/skipping.txt
+++ b/doc/en/skipping.txt
@@ -183,7 +183,7 @@
 ---------------------------
 
 It is possible to apply markers like skip and xfail to individual
-test instances when using parametrize:
+test instances when using parametrize::
 
      import pytest
 
@@ -191,7 +191,7 @@
          (1, 2),
 	 pytest.mark.xfail((1, 0)),
 	 pytest.mark.xfail(reason="some bug")((1, 3)),
-	 (2, 3),
+         (2, 3),
          (3, 4),
          (4, 5),
          pytest.mark.skipif("sys.version_info >= (3,0)")((10, 11)),


https://bitbucket.org/hpk42/pytest/commits/a7926e988749/
Changeset:   a7926e988749
User:        hpk42
Date:        2013-10-02 07:48:41
Summary:     Merged in dirn/pytest/dirn/adjust-syntax-for-parametrize-documentat-1380671670976 (pull request #72)

Adjust syntax for parametrize documentation
Affected #:  1 file

diff -r 8124b841c6ca8c40963d4650143c32304932a3ec -r a7926e9887491c75330d414becd2b69ab6eb07a8 doc/en/skipping.txt
--- a/doc/en/skipping.txt
+++ b/doc/en/skipping.txt
@@ -183,7 +183,7 @@
 ---------------------------
 
 It is possible to apply markers like skip and xfail to individual
-test instances when using parametrize:
+test instances when using parametrize::
 
      import pytest
 
@@ -191,7 +191,7 @@
          (1, 2),
 	 pytest.mark.xfail((1, 0)),
 	 pytest.mark.xfail(reason="some bug")((1, 3)),
-	 (2, 3),
+         (2, 3),
          (3, 4),
          (4, 5),
          pytest.mark.skipif("sys.version_info >= (3,0)")((10, 11)),

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.