diff rhodecode/__init__.py @ 3960:5293d4bbb1ea

Merged dev into stable/default/master branch
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 07 Jun 2013 00:31:11 +0200
parents c480e62f44d3 a2de0de0a4a9
children 7f71d22a1794
line wrap: on
line diff
--- a/rhodecode/__init__.py	Mon May 20 12:26:09 2013 +0200
+++ b/rhodecode/__init__.py	Fri Jun 07 00:31:11 2013 +0200
@@ -26,32 +26,7 @@
 import sys
 import platform
 
-VERSION = (1, 6, 1)
-
-try:
-    from rhodecode.lib import get_current_revision
-    _rev = get_current_revision(quiet=True)
-    if _rev and len(VERSION) > 3:
-        VERSION += ('dev%s' % _rev[0],)
-except ImportError:
-    pass
-
-__version__ = ('.'.join((str(each) for each in VERSION[:3])) +
-               '.'.join(VERSION[3:]))
-__dbversion__ = 11  # defines current db version for migrations
-__platform__ = platform.system()
-__license__ = 'GPLv3'
-__py_version__ = sys.version_info
-__author__ = 'Marcin Kuzminski'
-__url__ = 'http://rhodecode.org'
-
-PLATFORM_WIN = ('Windows')
-PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD', 'OpenBSD', 'SunOS') #depracated
-
-is_windows = __platform__ in PLATFORM_WIN
-is_unix = not is_windows
-
-
+VERSION = (1, 7, 0)
 BACKENDS = {
     'hg': 'Mercurial repository',
     'git': 'Git repository',
@@ -65,3 +40,23 @@
 
 # Linked module for extensions
 EXTENSIONS = {}
+
+try:
+    from rhodecode.lib import get_current_revision
+    _rev = get_current_revision(quiet=True)
+    if _rev and len(VERSION) > 3:
+        VERSION += ('%s' % _rev[0],)
+except ImportError:
+    pass
+
+__version__ = ('.'.join((str(each) for each in VERSION[:3])) +
+               '.'.join(VERSION[3:]))
+__dbversion__ = 13  # defines current db version for migrations
+__platform__ = platform.system()
+__license__ = 'GPLv3'
+__py_version__ = sys.version_info
+__author__ = 'Marcin Kuzminski'
+__url__ = 'http://rhodecode.org'
+
+is_windows = __platform__ in ['Windows']
+is_unix = not is_windows