Mercurial > public > src > rhodecode
changeset 2050:b1ad9efeec14 beta
fixed requires files, added distinction on win vs other platforms
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 28 Jan 2012 18:07:20 +0200 |
| parents | 9bbde54232dc |
| children | fc6063e6630b |
| files | requires.txt rhodecode/__init__.py setup.py |
| diffstat | 3 files changed, 15 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/requires.txt Sat Jan 28 07:14:34 2012 +0200 +++ b/requires.txt Sat Jan 28 18:07:20 2012 +0200 @@ -5,7 +5,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 @@ -14,4 +13,6 @@ 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
--- a/rhodecode/__init__.py Sat Jan 28 07:14:34 2012 +0200 +++ b/rhodecode/__init__.py Sat Jan 28 18:07:20 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, 3, 0, 'beta') @@ -30,6 +31,7 @@ __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 @@ "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 @@ "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
--- a/setup.py Sat Jan 28 07:14:34 2012 +0200 +++ b/setup.py Sat Jan 28 18:07:20 2012 +0200 @@ -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 @@ '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