diff --git a/requires.txt b/requires.txt --- a/requires.txt +++ b/requires.txt @@ -5,7 +5,6 @@ formencode==1.2.4 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 @@ -14,4 +13,6 @@ dulwich>=0.8.0,<0.9.0 vcs>=0.2.3.dev webob==1.0.8 markdown==2.0.3 -docutils==0.8.1 \ No newline at end of file +docutils==0.8.1 +py-bcrypt +mercurial>=2.0,<2.1 \ No newline at end of file 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, 3, 0, 'beta') @@ -30,6 +31,7 @@ VERSION = (1, 3, 0, 'beta') __dbversion__ = 4 # 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", @@ -54,6 +55,16 @@ requirements = [ "docutils==0.8.1", ] +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.1") + try: from rhodecode.lib import get_current_revision diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -1,8 +1,6 @@ import sys from rhodecode import get_version -from rhodecode import __platform__ from rhodecode import __license__ -from rhodecode import PLATFORM_OTHERS from rhodecode import requirements py_version = sys.version_info @@ -27,13 +25,6 @@ classifiers = ['Development Status :: 4 '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