Merge branch 'master' of github.com:ask/celery

docs/userguide/tasks.rst

@@ -791,7 +791,7 @@ base class for new task types.
     class DebugTask(Task):
         abstract = True
 
-        def after_return(self, \*args, \*\*kwargs):
+        def after_return(self, *args, **kwargs):
             print("Task returned: %r" % (self.request, ))
 
 

requirements/default-py3k.txt

@@ -1,4 +1,4 @@
-python-dateutil>=2.0.0
+python-dateutil>=2.0
 anyjson>=0.3.1
 pytz
 kombu>=2.1.0

requirements/default.txt

@@ -1,3 +1,3 @@
-python-dateutil>=1.5.0,<2.0.0
+python-dateutil>=1.5,<2.0
 anyjson>=0.3.1
 kombu>=2.1.1,<3.0

setup.cfg

@@ -44,6 +44,6 @@ upload-dir = docs/.build/html
 requires = uuid
            importlib
            multiprocessing == 2.6.2.1
-           python-dateutil >= 1.5.0
+           python-dateutil >= 1.5
            anyjson >= 0.3.1
            kombu >= 2.1.1

setup.py

@@ -118,9 +118,9 @@ install_requires.extend([
     "kombu>=2.1.1,<3.0",
 ])
 if is_py3k:
-    install_requires.append("python-dateutil>=2.0.0")
+    install_requires.append("python-dateutil>=2.0")
 else:
-    install_requires.append("python-dateutil>=1.5.0,<2.0.0")
+    install_requires.append("python-dateutil>=1.5,<2.0")
 
 py_version = sys.version_info
 is_jython = sys.platform.startswith("java")