Skip to content

Commit 1bd6276

Browse files
author
Ask Solem
committed
Don't use odd/even versioning semantics (transition to semver). Closes celery#171.
1 parent bfa06c1 commit 1bd6276

File tree

3 files changed

+2
-18
lines changed

3 files changed

+2
-18
lines changed

celery/__init__.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
"""Distributed Task Queue"""
22

3-
VERSION = (2, 1, 0)
3+
VERSION = (2, 1, 0, "a1")
44

55
__version__ = ".".join(map(str, VERSION[0:3])) + "".join(VERSION[3:])
66
__author__ = "Ask Solem"
77
__contact__ = "[email protected]"
88
__homepage__ = "http://github.com/ask/celery/"
99
__docformat__ = "restructuredtext"
10-
11-
12-
def is_stable_release():
13-
if len(VERSION) > 3 and isinstance(VERSION[3], basestring):
14-
return False
15-
return not VERSION[1] % 2
16-
17-
18-
def version_with_meta():
19-
return "%s (%s)" % (__version__,
20-
is_stable_release() and "stable" or "unstable")

celery/tests/test_celery.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@ def test_version(self):
99
self.assertTrue(celery.VERSION)
1010
self.assertGreaterEqual(len(celery.VERSION), 3)
1111
celery.VERSION = (0, 3, 0)
12-
self.assertFalse(celery.is_stable_release())
1312
self.assertGreaterEqual(celery.__version__.count("."), 2)
14-
self.assertIn("(unstable)", celery.version_with_meta())
15-
celery.VERSION = (0, 4, 0)
16-
self.assertTrue(celery.is_stable_release())
17-
self.assertIn("(stable)", celery.version_with_meta())
1813

1914
def test_meta(self):
2015
for m in ("__author__", "__contact__", "__homepage__",

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
# The short X.Y version.
3535
version = ".".join(map(str, celery.VERSION[0:2]))
3636
# The full version, including alpha/beta/rc tags.
37-
release = celery.version_with_meta()
37+
release = celery.__version__
3838

3939
exclude_trees = ['.build']
4040

0 commit comments

Comments
 (0)