diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2012-05-16 13:29:40 +0200 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2012-05-16 13:29:40 +0200 |
| commit | bb6ebb379a669a85c7d1d5a24fccaa3f3dad1564 (patch) | |
| tree | df8f2d694b8cb69177109caa9d622bda27b18160 /rhodecode/__init__.py | |
| parent | b738ddacb95053efc7bec4cd79b8123b04287e30 (diff) | |
| parent | 5bf3c7347f38cbe8852ab46fe9ef21757ffdb092 (diff) | |
merge beta into codereview
--HG--
branch : codereview
Diffstat (limited to 'rhodecode/__init__.py')
| -rw-r--r-- | rhodecode/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py index fa3866b7..b542c21a 100644 --- a/rhodecode/__init__.py +++ b/rhodecode/__init__.py @@ -46,6 +46,9 @@ __py_version__ = sys.version_info PLATFORM_WIN = ('Windows') PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD', 'OpenBSD', 'SunOS') +is_windows = __platform__ in PLATFORM_WIN +is_unix = __platform__ in PLATFORM_OTHERS + requirements = [ "Pylons==1.0.0", "Beaker==1.6.3", @@ -62,13 +65,13 @@ requirements = [ "webob==1.0.8", "markdown==2.1.1", "docutils==0.8.1", + "simplejson==2.5.2", ] if __py_version__ < (2, 6): - requirements.append("simplejson") requirements.append("pysqlite") -if __platform__ in PLATFORM_WIN: +if is_windows: requirements.append("mercurial>=2.2.1,<2.3") else: requirements.append("py-bcrypt") |