From 582a2100b1975db084f10530de28355d306b4a39 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sun, 7 Nov 2010 07:14:50 +0100
Subject: [PATCH] fix test, bump version

---
 pytest/__init__.py         | 2 +-
 setup.py                   | 2 +-
 testing/acceptance_test.py | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pytest/__init__.py b/pytest/__init__.py
index 98ad3b1bc..8a2be2947 100644
--- a/pytest/__init__.py
+++ b/pytest/__init__.py
@@ -5,7 +5,7 @@ see http://pytest.org for documentation and details
 
 (c) Holger Krekel and others, 2004-2010
 """
-__version__ = '2.0.0.dev20'
+__version__ = '2.0.0.dev21'
 
 __all__ = ['config', 'cmdline']
 
diff --git a/setup.py b/setup.py
index d559e9818..59dd023a9 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.0.0.dev20',
+        version='2.0.0.dev21',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
index e8acf7837..9b06e0996 100644
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -273,6 +273,7 @@ class TestInvocationVariants:
         res = testdir.run(py.std.sys.executable, "-m", "py.test", str(p1))
         assert res.ret == 1
 
+    @py.test.mark.skipif("sys.version_info < (2,5)")
     def test_python_pytest_main(self, testdir):
         p1 = testdir.makepyfile("def test_pass(): pass")
         res = testdir.run(py.std.sys.executable, "-m", "pytest.main", str(p1))