Browse Source

Don't use odd/even versioning semantics (transition to semver). Closes #171.

Ask Solem 14 years ago
parent
commit
1bd6276247
3 changed files with 2 additions and 18 deletions
  1. 1 12
      celery/__init__.py
  2. 0 5
      celery/tests/test_celery.py
  3. 1 1
      docs/conf.py

+ 1 - 12
celery/__init__.py

@@ -1,20 +1,9 @@
 """Distributed Task Queue"""
 
-VERSION = (2, 1, 0)
+VERSION = (2, 1, 0, "a1")
 
 __version__ = ".".join(map(str, VERSION[0:3])) + "".join(VERSION[3:])
 __author__ = "Ask Solem"
 __contact__ = "ask@celeryproject.org"
 __homepage__ = "http://github.com/ask/celery/"
 __docformat__ = "restructuredtext"
-
-
-def is_stable_release():
-    if len(VERSION) > 3 and isinstance(VERSION[3], basestring):
-        return False
-    return not VERSION[1] % 2
-
-
-def version_with_meta():
-    return "%s (%s)" % (__version__,
-                        is_stable_release() and "stable" or "unstable")

+ 0 - 5
celery/tests/test_celery.py

@@ -9,12 +9,7 @@ class TestInitFile(unittest.TestCase):
         self.assertTrue(celery.VERSION)
         self.assertGreaterEqual(len(celery.VERSION), 3)
         celery.VERSION = (0, 3, 0)
-        self.assertFalse(celery.is_stable_release())
         self.assertGreaterEqual(celery.__version__.count("."), 2)
-        self.assertIn("(unstable)", celery.version_with_meta())
-        celery.VERSION = (0, 4, 0)
-        self.assertTrue(celery.is_stable_release())
-        self.assertIn("(stable)", celery.version_with_meta())
 
     def test_meta(self):
         for m in ("__author__", "__contact__", "__homepage__",

+ 1 - 1
docs/conf.py

@@ -34,7 +34,7 @@ copyright = u'2009, Ask Solem'
 # The short X.Y version.
 version = ".".join(map(str, celery.VERSION[0:2]))
 # The full version, including alpha/beta/rc tags.
-release = celery.version_with_meta()
+release = celery.__version__
 
 exclude_trees = ['.build']