1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/92dba42a205b/
Changeset:   92dba42a205b
User:        hpk42
Date:        2014-07-29 15:00:45
Summary:     add flub and pelme talks at EuroPython2014, remove one past 
training note
Affected #:  2 files

diff -r cb8998b708a6ee9645a7dbc4255d7f6395623ff3 -r 
92dba42a205bd4ffb93e024ba87181b676685555 doc/en/index.txt
--- a/doc/en/index.txt
+++ b/doc/en/index.txt
@@ -3,9 +3,7 @@
 
 .. note::
 
-   `improving your automated testing with pytest 
<https://ep2014.europython.eu/en/schedule/sessions/92/>`_, July 25th 2014, 
Berlin, Germany
-
-   `professional testing with pytest and tox 
<http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_,
 24-26th November 2014, Freiburg, Germany
+   next training: `professional testing with pytest and tox 
<http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_,
 24-26th November 2014, Freiburg, Germany
 
 
 pytest: helps you write better programs

diff -r cb8998b708a6ee9645a7dbc4255d7f6395623ff3 -r 
92dba42a205bd4ffb93e024ba87181b676685555 doc/en/talks.txt
--- a/doc/en/talks.txt
+++ b/doc/en/talks.txt
@@ -4,8 +4,6 @@
 
 .. sidebar:: Next Open Trainings
 
-   `improving your automated testing with pytest 
<https://ep2014.europython.eu/en/schedule/sessions/92/>`_, July 25th 2014, 
Berlin, Germany
-
    `professional testing with pytest and tox 
<http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_,
 24-26th November 2014, Freiburg, Germany
 
 .. _`funcargs`: funcargs.html
@@ -18,6 +16,12 @@
 
 Basic usage and fixtures:
 
+- `Introduction to pytest by Andreas Pelme EuroPython 2014
+  <https://www.youtube.com/watch?v=LdVJj65ikRY>`_.
+
+- `Advanced Uses of py.test Fixtures by Floris Bruynooghe EuroPython
+  2014 <https://www.youtube.com/watch?v=IBC_dxr-4ps>`_.
+
 - `pytest feature and release highlights (GERMAN, October 2013)
   <http://pyvideo.org/video/2429/pytest-feature-and-new-release-highlights>`_

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit

Reply via email to