# HG changeset patch # User Marcin Kuzminski # Date 2012-03-18 15:03:58 # Node ID b70721d03e8477c0ef294b5ed47bf044bde13fda # Parent 8a37f681ccdb15deb566536e58cbd406781cd63d pep386 versioning diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -19,7 +19,7 @@ RhodeCode works on *nix systems and Wind that Lukasz Balcerzak and Marcin Kuzminski created to handle multiple different version control systems. -RhodeCode uses `Semantic Versioning `_ +RhodeCode uses `PEP386 versioning http://www.python.org/dev/peps/pep-0386/`_ Installation ------------ diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py --- a/rhodecode/__init__.py +++ b/rhodecode/__init__.py @@ -4,7 +4,7 @@ ~~~~~~~~~~~~~~~~~~ RhodeCode, a web based repository management based on pylons - versioning implementation: http://semver.org/ + versioning implementation: http://www.python.org/dev/peps/pep-0386/ :created_on: Apr 9, 2010 :author: marcink @@ -26,8 +26,17 @@ import sys import platform -VERSION = (1, 3, 4, 'beta') -__version__ = '.'.join((str(each) for each in VERSION[:4])) +VERSION = (1, 3, 4, 'b') + +try: + from rhodecode.lib import get_current_revision + _rev = get_current_revision() + VERSION += ('dev%s' % _rev[0],) +except ImportError: + pass + +__version__ = ('.'.join((str(each) for each in VERSION[:3])) + + '.'.join(VERSION[3:])) __dbversion__ = 5 # defines current db version for migrations __platform__ = platform.system() __license__ = 'GPLv3' @@ -65,17 +74,6 @@ else: requirements.append("mercurial>=2.1,<2.2") -try: - from rhodecode.lib import get_current_revision - _rev = get_current_revision() -except ImportError: - # this is needed when doing some setup.py operations - _rev = False - -if len(VERSION) > 3 and _rev: - __version__ += ' [rev:%s]' % _rev[0] - - def get_version(): """Returns shorter version (digit parts only) as string."""