Mercurial > kallithea

changeset 1215:8a153dba7033

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes #140
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 05 Apr 2011 17:34:04 +0200
parents 45fed9a435b7
children 8363b0d20c41
files docs/changelog.rst setup.py
diffstat 2 files changed, 23 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/docs/changelog.rst	Tue Apr 05 12:08:34 2011 +0200
+++ b/docs/changelog.rst	Tue Apr 05 17:34:04 2011 +0200
@@ -3,6 +3,19 @@
 Changelog
 =========
 
+
+1.1.7 (**2011-03-23**)
+======================
+
+news
+----
+
+fixes
+-----
+
+- fixed #140 freeze of python dateutil library, since new version is python2.x
+  incompatible
+
 1.1.7 (**2011-03-23**)
 ======================
 
--- a/setup.py	Tue Apr 05 12:08:34 2011 +0200
+++ b/setup.py	Tue Apr 05 17:34:04 2011 +0200
@@ -1,6 +1,7 @@
 import sys
 from rhodecode import get_version
 from rhodecode import __platform__
+from rhodecode import __license__
 
 py_version = sys.version_info
 
@@ -16,17 +17,20 @@
         "pygments==1.4.0",
         "mercurial==1.7.5",
         "whoosh==1.3.4",
-        "celery==2.2.4",
+        "celery==2.2.5",
         "babel",
+        "python-dateutil>=1.5.0,<2.0.0",
     ]
 
 classifiers = ['Development Status :: 5 - Production/Stable',
                'Environment :: Web Environment',
                'Framework :: Pylons',
                'Intended Audience :: Developers',
-               'License :: OSI Approved :: BSD License',
                'Operating System :: OS Independent',
-               'Programming Language :: Python', ]
+               'Programming Language :: Python',
+               'Programming Language :: Python :: 2.5',
+               'Programming Language :: Python :: 2.6',
+               'Programming Language :: Python :: 2.7', ]
 
 if py_version < (2, 6):
     requirements.append("simplejson")
@@ -45,10 +49,9 @@
 
 description = ('Mercurial repository browser/management with '
                'build in push/pull server and full text search')
-keywords = ' '.join (['rhodecode', 'rhodiumcode', 'mercurial', 'git',
+keywords = ' '.join(['rhodecode', 'rhodiumcode', 'mercurial', 'git',
                       'repository management', 'hgweb replacement'
-                      'hgwebdir', 'gitweb replacement', 'serving hgweb',
-                     ])
+                      'hgwebdir', 'gitweb replacement', 'serving hgweb', ])
 #long description
 try:
     readme_file = 'README.rst'
@@ -78,7 +81,7 @@
     description=description,
     long_description=long_description,
     keywords=keywords,
-    license='GPLv3',
+    license=__license__,
     author='Marcin Kuzminski',
     author_email='marcin@python-works.com',
     url='http://rhodecode.org',
@@ -108,9 +111,5 @@
     make-index = rhodecode.lib.indexers:MakeIndex
     upgrade-db = rhodecode.lib.dbmigrate:UpgradeDb
     celeryd=rhodecode.lib.celerypylons.commands:CeleryDaemonCommand
-    celerybeat=rhodecode.lib.celerypylons.commands:CeleryBeatCommand
-    camqadm=rhodecode.lib.celerypylons.commands:CAMQPAdminCommand
-    celeryev=rhodecode.lib.celerypylons.commands:CeleryEventCommand
-              
     """,
 )