Mercurial > kallithea
changeset 1965:2ba965341189
freeze hg version to 2.0.1 for windows due to a bug in mercurial that breaks forking in rhodecode-win
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 28 Jan 2012 18:11:45 +0200 |
| parents | 1ce36a5f2305 |
| children | 2dca2f93f3e1 |
| files | rhodecode/__init__.py setup.py |
| diffstat | 2 files changed, 14 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/__init__.py Sat Jan 28 07:14:01 2012 +0200 +++ b/rhodecode/__init__.py Sat Jan 28 18:11:45 2012 +0200 @@ -23,6 +23,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import sys import platform VERSION = (1, 2, 5) @@ -30,6 +31,7 @@ __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 @@ "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 @@ "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
--- a/setup.py Sat Jan 28 07:14:01 2012 +0200 +++ b/setup.py Sat Jan 28 18:11:45 2012 +0200 @@ -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 @@ '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