From 94e31e414a476151d6a9efa33a6e30f6b9c33080 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Mon, 12 Dec 2011 12:45:28 +0000
Subject: [PATCH] bump version depend on new pylib

---
 CHANGELOG           | 2 +-
 _pytest/__init__.py | 2 +-
 setup.py            | 4 ++--
 tox.ini             | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c9bd738d9..6b7bd10b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,7 +4,7 @@ Changes between 2.2.0 and 2.2.1.dev
 - fix issue99 (in pytest and py) internallerrors with resultlog now
   produce better output - fixed by normalizing pytest_internalerror 
   input arguments.
-- fix traceback issues (in pytest and py) improve traceback output
+- fix issue97 / traceback issues (in pytest and py) improve traceback output
   in conjunction with jinja2 and cython which hack tracebacks
 - fix issue93 (in pytest and pytest-xdist) avoid "delayed teardowns":
   the final test in a test node will now run its teardown directly
diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index 23b8395b9..260d50188 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.2.1.dev3'
+__version__ = '2.2.1.dev4'
diff --git a/setup.py b/setup.py
index 6fb1c4873..2a31ab2e4 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.2.1.dev3',
+        version='2.2.1.dev4',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
@@ -32,7 +32,7 @@ def main():
         author_email='holger at merlinux.eu',
         entry_points= make_entry_points(),
         # the following should be enabled for release
-        install_requires=['py>=1.4.6.dev4'],
+        install_requires=['py>=1.4.6.dev5'],
         classifiers=['Development Status :: 6 - Mature',
                      'Intended Audience :: Developers',
                      'License :: OSI Approved :: MIT License',
diff --git a/tox.ini b/tox.ini
index 7f96af2bf..bd927820d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,8 +51,7 @@ commands=
     make html
 
 [testenv:py31]
-deps=py>1.4.0
-    :pypi:nose>=1.0
+deps=:pypi:nose>=1.0
 
 [testenv:py31-xdist]
 deps=pytest-xdist