diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py --- a/rhodecode/__init__.py +++ b/rhodecode/__init__.py @@ -23,6 +23,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +import sys import platform VERSION = (1, 2, 5) @@ -30,6 +31,7 @@ VERSION = (1, 2, 5) __dbversion__ = 3 # defines current db version for migrations __platform__ = platform.system() __license__ = 'GPLv3' +__py_version__ = sys.version_info PLATFORM_WIN = ('Windows') PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD', 'OpenBSD', 'SunOS') @@ -42,7 +44,6 @@ requirements = [ "SQLAlchemy==0.7.4", "Mako==0.5.0", "pygments>=1.4", - "mercurial>=2.0,<2.1", "whoosh<1.8", "celery>=2.2.5,<2.3", "babel", @@ -52,6 +53,16 @@ requirements = [ "webob==1.0.8" ] +if __py_version__ < (2, 6): + requirements.append("simplejson") + requirements.append("pysqlite") + +if __platform__ in PLATFORM_WIN: + requirements.append("mercurial==2.0.1") +else: + requirements.append("py-bcrypt") + requirements.append("mercurial==2.0.2") + try: from rhodecode.lib import get_current_revision diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -1,13 +1,10 @@ import sys from rhodecode import get_version -from rhodecode import __platform__ from rhodecode import __license__ -from rhodecode import PLATFORM_OTHERS +from rhodecode import __py_version__ from rhodecode import requirements -py_version = sys.version_info - -if py_version < (2, 5): +if __py_version__ < (2, 5): raise Exception('RhodeCode requires python 2.5 or later') @@ -25,13 +22,6 @@ classifiers = ['Development Status :: 5 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', ] -if py_version < (2, 6): - requirements.append("simplejson") - requirements.append("pysqlite") - -if __platform__ in PLATFORM_OTHERS: - requirements.append("py-bcrypt") - # additional files from project that goes somewhere in the filesystem # relative to sys.prefix