Merge branch '3.0'

celery/bin/base.py

@@ -291,7 +291,7 @@ class Command(object):
             os.environ['CELERY_CONFIG_MODULE'] = config_module
         if app:
             self.app = self.find_app(app)
-        else:
+        elif self.app is None:
             self.app = self.get_app(loader=loader)
         if self.enable_config_from_cmdline:
             argv = self.process_cmdline_config(argv)

celery/task/trace.py

@@ -120,7 +120,7 @@ class TraceInfo(object):
             signals.task_failure.send(sender=task, task_id=req.id,
                                       exception=exc, args=req.args,
                                       kwargs=req.kwargs,
-                                      traceback=einfo.traceback,
+                                      traceback=einfo.tb,
                                       einfo=einfo)
             return einfo
         finally:

examples/next-steps/proj/celery.py

@@ -2,7 +2,8 @@ from __future__ import absolute_import
 
 from celery import Celery
 
-celery = Celery(broker='amqp://',
+celery = Celery('proj.celery',
+                broker='amqp://',
                 backend='amqp://',
                 include=['proj.tasks'])
 
@@ -10,3 +11,6 @@ celery = Celery(broker='amqp://',
 celery.conf.update(
     CELERY_TASK_RESULT_EXPIRES=3600,
 )
+
+if __name__ == '__main__':
+    celery.start()

examples/next-steps/setup.py

@@ -0,0 +1,20 @@
+"""
+Example setup file for a project using Celery.
+
+This can be used to distribute your tasks and worker
+as a Python package, on PyPI or on your own private package index.
+
+"""
+from setuptools import setup, find_packages
+
+setup(
+    name='example-tasks',
+    version='1.0',
+    description='Tasks for my project',
+    packages=find_packages(exclude=['ez_setup', 'tests', 'tests.*']),
+    zip_safe=False,
+    install_requires=[
+        'celery>=3.0',
+        #'requests',
+    ],
+)