summaryrefslogtreecommitdiff
path: root/pytest.py
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2011-03-06 18:32:00 +0100
committerholger krekel <holger@merlinux.eu>2011-03-06 18:32:00 +0100
commitc552b58dc5e2f1cba7c1e8db9e2d666aeff78db9 (patch)
tree977fa967d112fd39ed0828368ec45111d69ba1c5 /pytest.py
parent18e784c9c92f581c2e2385ec991e19182e0221a1 (diff)
downloadpytest-c552b58dc5e2f1cba7c1e8db9e2d666aeff78db9.tar.gz
fix issue27 - --collectonly and -k keyword selection now work together.
internally, collectonly and terminal reporting has been unified.
Diffstat (limited to 'pytest.py')
-rw-r--r--pytest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pytest.py b/pytest.py
index eb8e4b37d..2aee852a2 100644
--- a/pytest.py
+++ b/pytest.py
@@ -1,7 +1,7 @@
"""
unit and functional testing with Python.
"""
-__version__ = '2.0.2.dev4'
+__version__ = '2.0.2.dev5'
__all__ = ['main']
from _pytest.core import main, UsageError, _preloadplugins