Browse Source

celery.VERSION is now a namedtuple

Ask Solem 11 years ago
parent
commit
a8070cf1cf
2 changed files with 9 additions and 3 deletions
  1. 8 2
      celery/__init__.py
  2. 1 1
      setup.py

+ 8 - 2
celery/__init__.py

@@ -7,9 +7,15 @@
 
 from __future__ import absolute_import
 
+from collections import namedtuple
+
+version_info_t = namedtuple(
+    'version_info_t', ('major', 'minor', 'micro', 'releaselevel', 'serial'),
+)
+
 SERIES = 'Cipater'
-VERSION = (3, 1, 4)
-__version__ = '.'.join(str(p) for p in VERSION[0:3]) + ''.join(VERSION[3:])
+VERSION = version_info_t(3, 1, 4, '', 0)
+__version__ = '{0.major}.{0.minor}.{0.micro}{0.releaselevel}'.format(VERSION)
 __author__ = 'Ask Solem'
 __contact__ = 'ask@celeryproject.org'
 __homepage__ = 'http://celeryproject.org'

+ 1 - 1
setup.py

@@ -89,7 +89,7 @@ PYPY = hasattr(sys, 'pypy_version_info')
 
 import re
 re_meta = re.compile(r'__(\w+?)__\s*=\s*(.*)')
-re_vers = re.compile(r'VERSION\s*=\s*\((.*?)\)')
+re_vers = re.compile(r'VERSION\s*=.*?\((.*?)\)')
 re_doc = re.compile(r'^"""(.+?)"""')
 rq = lambda s: s.strip("\"'")