kallithea Changeset - 2ba965341189

Changeset - 2ba965341189

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 14 years ago 2012-01-28 17:11:45
marcin@python-works.com

freeze hg version to 2.0.1 for windows due to a bug in mercurial that breaks forking in rhodecode-win

2 files changed with 14 insertions and 13 deletions:

rhodecode/__init__.py

setup.py

0 comments (0 inline, 0 general)

rhodecode/__init__.py

➞

Show inline comments

@@ @@ -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 @@ __version__ = '.'.join((str(each) for ea @@
 __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 @@ 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",
@@ @@ -52,6 +53,16 @@ requirements = [ @@
     "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

setup.py

➞

Show inline comments

 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 @@ classifiers = ['Development Status :: 5 @@
                '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

0 comments (0 inline, 0 general)