# HG changeset patch # User Marcin Kuzminski # Date 2011-03-21 21:34:13 # Node ID c5af1d3c861fb36b156224e75c2f55a97f54657d # Parent 9ca53f5d95a188bb3df383e46d7c8ba4bd55ee84 changes for rhodecode release 1.1.6 diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -34,7 +34,7 @@ Source code The latest source for RhodeCode can be obtained from official RhodeCode instance https://hg.rhodecode.org -Rarely updated source code and issue tracker is available at bitbcuket +Rarely updated source code and issue tracker is available at bitbucket http://bitbucket.org/marcinkuzminski/rhodecode Installation @@ -48,8 +48,8 @@ RhodeCode Features - Has it's own middleware to handle mercurial_ protocol requests. Each request can be logged and authenticated. -- Runs on threads unlike hgweb. You can make multiple pulls/pushes simultaneous. Supports http/https - and LDAP +- Runs on threads unlike hgweb. You can make multiple pulls/pushes simultaneous. + Supports http/https and LDAP - Full permissions (private/read/write/admin) and authentication per project. One account for web interface and mercurial_ push/pull/clone operations. - Mako templates let's you customize the look and feel of the application. @@ -116,12 +116,12 @@ You may also build the documentation for make html -(You need to have sphinx installed to build the documentation. If you don't -have sphinx installed you can install it via the command: ``easy_install sphinx``) +(You need to have sphinx_ installed to build the documentation. If you don't +have sphinx_ installed you can install it via the command: ``easy_install sphinx``) .. _virtualenv: http://pypi.python.org/pypi/virtualenv .. _python: http://www.python.org/ -.. _django: http://www.djangoproject.com/ +.. _sphinx: http://sphinx.pocoo.org/ .. _mercurial: http://mercurial.selenic.com/ .. _bitbucket: http://bitbucket.org/ .. _subversion: http://subversion.tigris.org/ diff --git a/docs/changelog.rst b/docs/changelog.rst --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -4,6 +4,18 @@ Changelog ========= +1.1.6 (**2011-03-21**) +====================== + +news +---- + +fixes +----- + +- fixed #136 installation support for FreeBSD +- RhodeCode will check for python version during installation + 1.1.5 (**2011-03-17**) ====================== diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py --- a/rhodecode/__init__.py +++ b/rhodecode/__init__.py @@ -27,11 +27,14 @@ # MA 02110-1301, USA. import platform -VERSION = (1, 1, 5) +VERSION = (1, 1, 6) __version__ = '.'.join((str(each) for each in VERSION[:4])) __dbversion__ = 2 #defines current db version for migrations __platform__ = platform.system() +PLATFORM_WIN = ('Windows',) +PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD',) + try: from rhodecode.lib.utils import get_current_revision _rev = get_current_revision() diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py --- a/rhodecode/lib/auth.py +++ b/rhodecode/lib/auth.py @@ -34,11 +34,11 @@ from pylons import config, session, url, from pylons.controllers.util import abort, redirect from pylons.i18n.translation import _ -from rhodecode import __platform__ +from rhodecode import __platform__, PLATFORM_WIN, PLATFORM_OTHERS -if __platform__ == 'Windows': +if __platform__ in PLATFORM_WIN: from hashlib import sha256 -if __platform__ in ('Linux', 'Darwin'): +if __platform__ in PLATFORM_OTHERS: import bcrypt from rhodecode.lib import str2bool @@ -89,9 +89,9 @@ class RhodeCodeCrypto(object): :param password: password to hash """ - if __platform__ == 'Windows': + if __platform__ in PLATFORM_WIN: return sha256(str_).hexdigest() - elif __platform__ in ('Linux', 'Darwin'): + elif __platform__ in PLATFORM_OTHERS: return bcrypt.hashpw(str_, bcrypt.gensalt(10)) else: raise Exception('Unknown or unsupported platform %s' % __platform__) diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html --- a/rhodecode/templates/base/base.html +++ b/rhodecode/templates/base/base.html @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- - + ${next.title()} diff --git a/rhodecode/templates/errors/error_document.html b/rhodecode/templates/errors/error_document.html --- a/rhodecode/templates/errors/error_document.html +++ b/rhodecode/templates/errors/error_document.html @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- - + Error - ${c.error_message} diff --git a/rhodecode/templates/login.html b/rhodecode/templates/login.html --- a/rhodecode/templates/login.html +++ b/rhodecode/templates/login.html @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- - + ${_('Sign In')} - ${c.rhodecode_name} diff --git a/rhodecode/templates/password_reset.html b/rhodecode/templates/password_reset.html --- a/rhodecode/templates/password_reset.html +++ b/rhodecode/templates/password_reset.html @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- - + ${_('Reset You password')} - ${c.rhodecode_name} diff --git a/rhodecode/templates/register.html b/rhodecode/templates/register.html --- a/rhodecode/templates/register.html +++ b/rhodecode/templates/register.html @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- - + ${_('Sign Up')} - ${c.rhodecode_name} diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -4,6 +4,9 @@ from rhodecode import __platform__ py_version = sys.version_info +if py_version < (2, 5): + raise Exception('RhodeCode requires python 2.5 or later') + requirements = [ "Pylons==1.0.0", "WebHelpers==1.2", @@ -75,7 +78,7 @@ setup( description=description, long_description=long_description, keywords=keywords, - license='BSD', + license='GPLv3', author='Marcin Kuzminski', author_email='marcin@python-works.com', url='http://rhodecode.org',