diff --git a/doc/en/conf.py b/doc/en/conf.py index b15711d65..b5129740f 100644 --- a/doc/en/conf.py +++ b/doc/en/conf.py @@ -17,7 +17,7 @@ # # The full version, including alpha/beta/rc tags. # The short X.Y version. -version = release = "2.3.4" +version = release = "2.3.4.1" import sys, os diff --git a/doc/en/talks.txt b/doc/en/talks.txt index 86f6bfa4c..4d562c30f 100644 --- a/doc/en/talks.txt +++ b/doc/en/talks.txt @@ -12,6 +12,9 @@ Tutorial examples and blog postings Basic usage and funcargs: +- `pytest introduction from Brian Okken (January 2013) + `_ + - `pycon australia 2012 pytest talk from Brianna Laugher `_ (`video `_, `slides `_, `code `_) - `pycon 2012 US talk video from Holger Krekel `_ @@ -57,7 +60,7 @@ Plugin specific examples: .. _`generating parametrized tests with funcargs`: funcargs.html#test-generators .. _`test generators and cached setup`: http://bruynooghe.blogspot.com/2010/06/pytest-test-generators-and-cached-setup.html -Conference talks and tutorials +Older conference talks and tutorials ---------------------------------------- - `ep2009-rapidtesting.pdf`_ tutorial slides (July 2009): diff --git a/tox.ini b/tox.ini index 11df1bdc5..bcb8146f2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] distshare={homedir}/.tox/distshare -envlist=py24,py26,py27,py27-nobyte,py31,py32,py33,py27-xdist,py25,trial +envlist=py25,py26,py27,py27-nobyte,py31,py32,py33,py27-xdist,trial indexserver= pypi = http://pypi.python.org/simple testrun = http://pypi.testrun.org