-

cool-RR · cool-RR · commit ae64b29cc751 · 2013-01-26T17:03:38.000+02:00
diff --git a/python_toolbox/__init__.py b/python_toolbox/__init__.py
@@ -16,5 +16,5 @@
 import python_toolbox.monkeypatch_copy_reg
 
 __version_info__ = python_toolbox.version_info.VersionInfo(0, 4, 0)
-__version__ = '0.4'
+__version__ = __version_info__.version_text
 
diff --git a/test_python_toolbox/test_address_tools/test_describe.py b/test_python_toolbox/test_address_tools/test_describe.py
@@ -29,7 +29,7 @@ def test_on_locally_defined_class():
     # Testing for locally defined class:
     
     
-    if python_toolbox.__version_info__ <= (0, 4, 0):
+    if python_toolbox.__version_info__ <= (0, 4, 0, 'release'):
         raise nose.SkipTest("This test doesn't pass in `python_toolbox` "
                             "version 0.4 and below, because `describe` :"
                             "doesn't support nested classes yet.")
@@ -249,7 +249,7 @@ def test_bad_module_name():
 
 def test_function_in_something():
     '''Test `describe` doesn't fail when describing `{1: sum}`.'''
-    if python_toolbox.__version_info__ <= (0, 4, 0):
+    if python_toolbox.__version_info__ <= (0, 4, 0, 'release'):
         raise nose.SkipTest("This test doesn't pass in `python_toolbox`"
                             "version 0.4 and below.")
     assert describe({1: sum}) == '{1: sum}'
diff --git a/test_python_toolbox/test_context_management/test_external.py b/test_python_toolbox/test_context_management/test_external.py
@@ -87,7 +87,7 @@ def woohoo():
         self.assertEqual(state, [1, 42, 999])
 
     def _create_contextmanager_attribs(self):
-        if python_toolbox.__version_info__ <= (0, 4, 0):
+        if python_toolbox.__version_info__ <= (0, 4, 0, 'release'):
             raise nose.SkipTest
         def attribs(**kw):
             def decorate(func):
@@ -109,7 +109,7 @@ def test_contextmanager_attribs(self):
     @unittest2.skipIf(hasattr(sys, 'flags') and sys.flags.optimize >= 2,
                       "Docstrings are omitted with -O2 and above")
     def test_contextmanager_doc_attrib(self):
-        if python_toolbox.__version_info__ <= (0, 4, 0):
+        if python_toolbox.__version_info__ <= (0, 4, 0, 'release'):
             raise nose.SkipTest('Not sure what to do about this.')
         baz = self._create_contextmanager_attribs()
         self.assertEqual(baz.__doc__, "Whee!")
@@ -214,7 +214,7 @@ def method(self, a, b, c=None):
 
 
     def test_typo_enter(self):
-        if python_toolbox.__version_info__ <= (0, 4, 0):
+        if python_toolbox.__version_info__ <= (0, 4, 0, 'release'):
             raise nose.SkipTest
         class MyContextManager(ContextManager):
             def __unter__(self):
@@ -228,7 +228,7 @@ def __exit__(self, *exc):
 
 
     def test_typo_exit(self):
-        if python_toolbox.__version_info__ <= (0, 4, 0):
+        if python_toolbox.__version_info__ <= (0, 4, 0, 'release'):
             raise nose.SkipTest
         class MyContextManager(ContextManager):
             def __enter__(self):
