jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge

This commit is contained in:
Ronny Pfannschmidt 2013-01-27 02:10:52 +01:00
parent 80f590288b c5f587d6db
commit 64e6c71bf6
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/en/conf.py
View File

@ -17,7 +17,7 @@
# #
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
# The short X.Y version. # The short X.Y version.
version = release = "2.3.4" version = release = "2.3.4.1"
import sys, os import sys, os

5
doc/en/talks.txt
View File

@ -12,6 +12,9 @@ Tutorial examples and blog postings
Basic usage and funcargs: Basic usage and funcargs:
- `pytest introduction from Brian Okken (January 2013)
<http://pythontesting.net/framework/pytest-introduction/>`_
- `pycon australia 2012 pytest talk from Brianna Laugher - `pycon australia 2012 pytest talk from Brianna Laugher
<http://2012.pycon-au.org/schedule/52/view_talk?day=sunday>`_ (`video <http://www.youtube.com/watch?v=DTNejE9EraI>`_, `slides <http://www.slideshare.net/pfctdayelise/funcargs-other-fun-with-pytest>`_, `code <https://gist.github.com/3386951>`_) <http://2012.pycon-au.org/schedule/52/view_talk?day=sunday>`_ (`video <http://www.youtube.com/watch?v=DTNejE9EraI>`_, `slides <http://www.slideshare.net/pfctdayelise/funcargs-other-fun-with-pytest>`_, `code <https://gist.github.com/3386951>`_)
- `pycon 2012 US talk video from Holger Krekel <http://www.youtube.com/watch?v=9LVqBQcFmyw>`_ - `pycon 2012 US talk video from Holger Krekel <http://www.youtube.com/watch?v=9LVqBQcFmyw>`_
@ -57,7 +60,7 @@ Plugin specific examples:
.. _`generating parametrized tests with funcargs`: funcargs.html#test-generators .. _`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 .. _`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): - `ep2009-rapidtesting.pdf`_ tutorial slides (July 2009):

2
tox.ini
View File

@ -1,6 +1,6 @@
[tox] [tox]
distshare={homedir}/.tox/distshare 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= indexserver=
pypi = http://pypi.python.org/simple pypi = http://pypi.python.org/simple
testrun = http://pypi.testrun.org testrun = http://pypi.testrun.org