From 1d35a0381288615b9f09228bda89c08cf7a81c56 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 17 Mar 2016 06:37:49 +0100 Subject: [PATCH] Update talks page --- doc/en/talks.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/en/talks.rst b/doc/en/talks.rst index 8ae5d74a1..7a5221845 100644 --- a/doc/en/talks.rst +++ b/doc/en/talks.rst @@ -4,7 +4,7 @@ Talks and Tutorials .. sidebar:: Next Open Trainings - `professional testing with pytest and tox `_, 24-26th November 2014, Freiburg, Germany + `professional testing with pytest and tox `_, 27-29th June 2016, Freiburg, Germany .. _`funcargs`: funcargs.html @@ -14,6 +14,9 @@ Talks and blog postings .. _`tutorial1 repository`: http://bitbucket.org/pytest-dev/pytest-tutorial1/ .. _`pycon 2010 tutorial PDF`: http://bitbucket.org/pytest-dev/pytest-tutorial1/raw/tip/pytest-basic.pdf +- `pytest - Rapid Simple Testing, Florian Bruhin, Swiss Python Summit 2016 + `_. + - `Improve your testing with Pytest and Mock, Gabe Hollombe, PyCon SG 2015 `_.