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

[commits-noreply at bitbucket.org]

5 new commits in pytest:

https://bitbucket.org/hpk42/pytest/commits/ac7cccd443f3/
Changeset:   ac7cccd443f3
User:        hpk42
Date:        2014-07-17 17:22:44
Summary:     bump doc version
Affected #:  1 file

diff -r bcc2056927578d6c3f155497b738199f8fab1bc9 -r ac7cccd443f3cdd1d0231a99413927656b5dcc41 doc/en/conf.py
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -17,8 +17,8 @@
 #
 # The full version, including alpha/beta/rc tags.
 # The short X.Y version.
-version = "2.5.2"
-release = "2.5.2"
+version = "2.6"
+release = "2.6.0"
 
 import sys, os
 


https://bitbucket.org/hpk42/pytest/commits/60725b17a9d1/
Changeset:   60725b17a9d1
User:        hpk42
Date:        2014-07-20 11:07:18
Summary:     fix release announce
Affected #:  1 file

diff -r 51fb835529406c3e9a4ee70b8fd99c77efdf7006 -r 60725b17a9d1af4100abb8be3f9f4ddf6262bf34 doc/en/announce/release-2.6.0.txt
--- a/doc/en/announce/release-2.6.0.txt
+++ b/doc/en/announce/release-2.6.0.txt
@@ -1,4 +1,4 @@
-pytest-2.6.0: fixes
+pytest-2.6.0: shorter tracebacks, new warning system, test runner compat
 ===========================================================================
 
 pytest is a mature Python testing tool with more than a 1000 tests


https://bitbucket.org/hpk42/pytest/commits/8ce584c4248b/
Changeset:   8ce584c4248b
User:        hpk42
Date:        2014-07-20 13:03:11
Summary:     Added tag 2.6.0 for changeset 60725b17a9d1
Affected #:  1 file

diff -r 60725b17a9d1af4100abb8be3f9f4ddf6262bf34 -r 8ce584c4248b212b365a8fe46d6271c91c001fa0 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -66,3 +66,4 @@
 a064ad64d167508a8e9e73766b1a4e6bd10c85db 2.5.0
 039d543d1ca02a716c0b0de9a7131beb8021e8a2 2.5.1
 421d3b4d150d901de24b1cbeb8955547b1420483 2.5.2
+60725b17a9d1af4100abb8be3f9f4ddf6262bf34 2.6.0


https://bitbucket.org/hpk42/pytest/commits/84e72a2a1848/
Changeset:   84e72a2a1848
User:        hpk42
Date:        2014-07-20 13:07:38
Summary:     some notes about upcoming trainings
Affected #:  2 files

diff -r 8ce584c4248b212b365a8fe46d6271c91c001fa0 -r 84e72a2a1848a7c6f0a7c716641af0507570eb51 doc/en/contents.txt
--- a/doc/en/contents.txt
+++ b/doc/en/contents.txt
@@ -1,3 +1,9 @@
+
+.. note::
+
+   `improving your automated testing with pytest <https://ep2014.europython.eu/en/schedule/sessions/92/>`_, July 25th 2014, Berlin, Germany
+
+   `professional testing with pytest and tox <http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_, 24-26th November 2014, Freiburg, Germany
 
 .. _toc:
 

diff -r 8ce584c4248b212b365a8fe46d6271c91c001fa0 -r 84e72a2a1848a7c6f0a7c716641af0507570eb51 doc/en/index.txt
--- a/doc/en/index.txt
+++ b/doc/en/index.txt
@@ -1,7 +1,7 @@
 
 .. _features:
 
-.. sidebar:: Next Open Trainings
+.. note::
 
    `improving your automated testing with pytest <https://ep2014.europython.eu/en/schedule/sessions/92/>`_, July 25th 2014, Berlin, Germany
 


https://bitbucket.org/hpk42/pytest/commits/88af949b9611/
Changeset:   88af949b9611
User:        hpk42
Date:        2014-07-20 13:15:21
Summary:     merge
Affected #:  1 file

diff -r 84e72a2a1848a7c6f0a7c716641af0507570eb51 -r 88af949b9611494e2c65d528f9e565b00fb7e8ca doc/en/conf.py
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -17,8 +17,8 @@
 #
 # The full version, including alpha/beta/rc tags.
 # The short X.Y version.
-version = "2.5.2"
-release = "2.5.2"
+version = "2.6"
+release = "2.6.0"
 
 import sys, os

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.