From faea7e1407c091513d4c5ba1f0b0101c96fad022 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Tue, 29 Jul 2014 15:00:45 +0200 Subject: [PATCH] add flub and pelme talks at EuroPython2014, remove one past training note --- doc/en/index.txt | 4 +--- doc/en/talks.txt | 8 ++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/en/index.txt b/doc/en/index.txt index 8b138537b..551677d6f 100644 --- a/doc/en/index.txt +++ b/doc/en/index.txt @@ -3,9 +3,7 @@ .. note:: - `improving your automated testing with pytest `_, July 25th 2014, Berlin, Germany - - `professional testing with pytest and tox `_, 24-26th November 2014, Freiburg, Germany + next training: `professional testing with pytest and tox `_, 24-26th November 2014, Freiburg, Germany pytest: helps you write better programs diff --git a/doc/en/talks.txt b/doc/en/talks.txt index 7e871ec52..1c40fe00e 100644 --- a/doc/en/talks.txt +++ b/doc/en/talks.txt @@ -4,8 +4,6 @@ Talks and Tutorials .. sidebar:: Next Open Trainings - `improving your automated testing with pytest `_, July 25th 2014, Berlin, Germany - `professional testing with pytest and tox `_, 24-26th November 2014, Freiburg, Germany .. _`funcargs`: funcargs.html @@ -18,6 +16,12 @@ Tutorial examples and blog postings Basic usage and fixtures: +- `Introduction to pytest by Andreas Pelme EuroPython 2014 + `_. + +- `Advanced Uses of py.test Fixtures by Floris Bruynooghe EuroPython + 2014 `_. + - `pytest feature and release highlights (GERMAN, October 2013) `_