prepare 1.5

Author: schmir

README.rst

@@ -6,9 +6,9 @@ pytest-twisted - test twisted code with pytest
 
 
 :Authors: Ralf Schmitt <[email protected]>
-:Version: 1.4
-:Date:    2012-11-26
-:Download: http://pypi.python.org/pypi/pytest-twisted#downloads
+:Version: 1.5
+:Date:    2014-02-04
+:Download: https://pypi.python.org/pypi/pytest-twisted#downloads
 :Code: https://github.com/schmir/pytest-twisted
 
 
@@ -51,6 +51,17 @@ functions, which take funcargs, does not work. Please use
       res = yield threads.deferToThread(os.listdir, tmpdir.strpath)
       assert res == []
 
+Waiting for deferreds in fixtures
+=================================
+`pytest.blockon` allows fixtures to wait for deferreds::
+
+  @pytest.fixture
+  def val():
+      d = defer.Deferred()
+      reactor.callLater(1.0, d.callback, 10)
+      return pytest.blockon(d)
+
+
 The twisted greenlet
 ====================
 Some libraries (e.g. corotwine) need to know the greenlet, which is

setup.py

@@ -4,7 +4,7 @@
 
 
 setup(name='pytest-twisted',
-      version='1.4',
+      version='1.5',
       description='A twisted plugin for py.test.',
       long_description=open("README.rst").read(),
       author='Ralf Schmitt',

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py25,py26,py27,docs
+envlist = py26,py27,docs
 
 
 [testenv]