diff --git a/doc/en/talks.txt b/doc/en/talks.txt index 1c40fe00e..d351740ed 100644 --- a/doc/en/talks.txt +++ b/doc/en/talks.txt @@ -8,38 +8,44 @@ Talks and Tutorials .. _`funcargs`: funcargs.html -Tutorial examples and blog postings +Talks and blog postings --------------------------------------------- .. _`tutorial1 repository`: http://bitbucket.org/hpk42/pytest-tutorial1/ .. _`pycon 2010 tutorial PDF`: http://bitbucket.org/hpk42/pytest-tutorial1/raw/tip/pytest-basic.pdf -Basic usage and fixtures: - -- `Introduction to pytest by Andreas Pelme EuroPython 2014 +- `Introduction to pytest, Andreas Pelme, EuroPython 2014 `_. -- `Advanced Uses of py.test Fixtures by Floris Bruynooghe EuroPython +- `Advanced Uses of py.test Fixtures, Floris Bruynooghe, EuroPython 2014 `_. -- `pytest feature and release highlights (GERMAN, October 2013) +- `Why i use py.test and maybe you should too, Andy Todd, Pycon AU 2013 + `_ + +- `3-part blog series about pytest from @pydanny alias Daniel Greenfeld (January + 2014) `_ + +- `pytest: helps you write better Django apps, Andreas Pelme, DjangoCon + Europe 2014 `_. + +- :ref:`fixtures` + +- `Testing Django Applications with pytest, Andreas Pelme, EuroPython + 2013 `_. + +- `Testes pythonics com py.test, Vinicius Belchior Assef Neto, Plone + Conf 2013, Brazil `_. + +- `Introduction to py.test fixtures, FOSDEM 2013, Floris Bruynooghe + `_. + +- `pytest feature and release highlights, Holger Krekel (GERMAN, October 2013) `_ - `pytest introduction from Brian Okken (January 2013) `_ -- `3-part blog series about pytest from Daniel Greenfeld (January - 2014) `_ - -- `pycon australia 2012 pytest talk from Brianna Laugher - `_ (`video `_, `slides `_, `code `_) -- `pycon 2012 US talk video from Holger Krekel `_ -- `pycon 2010 tutorial PDF`_ and `tutorial1 repository`_ - - -Fixtures and Function arguments: - -- :ref:`fixtures` - `monkey patching done right`_ (blog post, consult `monkeypatch plugin`_ for up-to-date API) @@ -79,6 +85,11 @@ Plugin specific examples: Older conference talks and tutorials ---------------------------------------- +- `pycon australia 2012 pytest talk from Brianna Laugher + `_ (`video `_, `slides `_, `code `_) +- `pycon 2012 US talk video from Holger Krekel `_ +- `pycon 2010 tutorial PDF`_ and `tutorial1 repository`_ + - `ep2009-rapidtesting.pdf`_ tutorial slides (July 2009): - testing terminology