Updated to Celery 3.1.6.

mboersma · mboersma · commit 463dfcfcac9f · 2013-12-02T12:48:39.000-07:00
diff --git a/Makefile b/Makefile
@@ -3,17 +3,17 @@ all:
 
 db:
 	python manage.py syncdb --noinput
-	python manage.py migrate
+	python manage.py migrate --noinput
 
 test:
-	python manage.py test api cm provider web
+	python -Wall manage.py test --noinput api cm provider web
 
 coverage:
-	coverage run manage.py test api cm provider web
+	coverage run manage.py test --noinput api cm provider web
 	coverage html
 
 test_client:
-	python -m unittest discover client.tests
+	python -Wall -m unittest discover client.tests
 
 flake8:
 	flake8
diff --git a/api/migrations/0001_initial.py b/api/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import datetime
+from south.utils import datetime_utils as datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
@@ -415,15 +415,15 @@ def backwards(self, orm):
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
             'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
             'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
             'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
         },
         u'contenttypes.contenttype': {
diff --git a/api/tests/__init__.py b/api/tests/__init__.py
@@ -27,15 +27,15 @@ def send_patch(self, path, data='', content_type='application/octet-stream',
 RequestFactory.patch = construct_patch
 Client.patch = send_patch
 
-from .app import *  # noqa
-from .auth import *  # noqa
-from .build import *  # noqa
-from .config import *  # noqa
-from .container import *  # noqa
-from .flavor import *  # noqa
-from .formation import *  # noqa
-from .key import *  # noqa
-from .layer import *  # noqa
-from .node import *  # noqa
-from .provider import *  # noqa
-from .release import *  # noqa
+from .test_app import *  # noqa
+from .test_auth import *  # noqa
+from .test_build import *  # noqa
+from .test_config import *  # noqa
+from .test_container import *  # noqa
+from .test_flavor import *  # noqa
+from .test_formation import *  # noqa
+from .test_key import *  # noqa
+from .test_layer import *  # noqa
+from .test_node import *  # noqa
+from .test_provider import *  # noqa
+from .test_release import *  # noqa
diff --git a/api/tests/test_app.py b/api/tests/test_app.py
@@ -10,10 +10,12 @@
 import os.path
 
 from django.test import TestCase
+from django.test.utils import override_settings
 
 from deis import settings
 
 
+@override_settings(CELERY_ALWAYS_EAGER=True)
 class AppTest(TestCase):
 
     """Tests creation of applications"""
diff --git a/api/tests/test_auth.py b/api/tests/test_auth.py
diff --git a/api/tests/test_build.py b/api/tests/test_build.py
@@ -10,12 +10,12 @@
 import uuid
 
 from django.test import TestCase
+from django.test.utils import override_settings
 
 from api.models import Build
 
-# pylint: disable=R0904
-
 
+@override_settings(CELERY_ALWAYS_EAGER=True)
 class BuildTest(TestCase):
 
     """Tests build notification from build system"""
diff --git a/api/tests/test_config.py b/api/tests/test_config.py
@@ -9,8 +9,10 @@
 import json
 
 from django.test import TestCase
+from django.test.utils import override_settings
 
 
+@override_settings(CELERY_ALWAYS_EAGER=True)
 class ConfigTest(TestCase):
 
     """Tests setting and updating config values"""
diff --git a/api/tests/test_container.py b/api/tests/test_container.py
@@ -9,6 +9,7 @@
 import json
 
 from django.test import TestCase
+from django.test.utils import override_settings
 
 from deis import settings
 
@@ -24,6 +25,7 @@ def get_allocations(container_dict):
     return sorted(counts.values())
 
 
+@override_settings(CELERY_ALWAYS_EAGER=True)
 class ContainerTest(TestCase):
 
     """Tests creation of containers on nodes"""
diff --git a/api/tests/test_flavor.py b/api/tests/test_flavor.py
diff --git a/api/tests/test_formation.py b/api/tests/test_formation.py
@@ -11,10 +11,12 @@
 import uuid
 
 from django.test import TestCase
+from django.test.utils import override_settings
 
 from deis import settings
 
 
+@override_settings(CELERY_ALWAYS_EAGER=True)
 class FormationTest(TestCase):
 
     """Tests creation of different node formations"""
diff --git a/api/tests/test_key.py b/api/tests/test_key.py
diff --git a/api/tests/test_layer.py b/api/tests/test_layer.py
@@ -8,10 +8,12 @@
 
 import json
 
-from django.test import TestCase
 from Crypto.PublicKey import RSA
+from django.test import TestCase
+from django.test.utils import override_settings
 
 
+@override_settings(CELERY_ALWAYS_EAGER=True)
 class LayerTest(TestCase):
 
     """Tests creation of different layers of node types"""
diff --git a/api/tests/test_node.py b/api/tests/test_node.py
@@ -9,8 +9,10 @@
 import json
 
 from django.test import TestCase
+from django.test.utils import override_settings
 
 
+@override_settings(CELERY_ALWAYS_EAGER=True)
 class NodeTest(TestCase):
 
     """Tests creation of nodes"""
diff --git a/api/tests/test_provider.py b/api/tests/test_provider.py
diff --git a/api/tests/test_release.py b/api/tests/test_release.py
@@ -7,11 +7,13 @@
 from __future__ import unicode_literals
 
 import json
+import uuid
 
 from django.test import TestCase
-import uuid
+from django.test.utils import override_settings
 
 
+@override_settings(CELERY_ALWAYS_EAGER=True)
 class ReleaseTest(TestCase):
 
     """Tests push notification from build system"""
diff --git a/client/setup.py b/client/setup.py
@@ -34,7 +34,7 @@
 setup(name='deis',
       version='0.3.0',
       license=APACHE_LICENSE,
-      description='Command-line Client for Deis',
+      description='Command-line Client for Deis, the open PaaS',
       author='OpDemand',
       author_email='info@opdemand.com',
       url='https://github.com/opdemand/deis',
diff --git a/deis/__init__.py b/deis/__init__.py
@@ -4,4 +4,9 @@
 the api, provider, cm, and web Django apps.
 """
 
+from __future__ import absolute_import
+
+from .celery import app  # noqa
+
+
 __version__ = '0.3.0'
diff --git a/deis/celery.py b/deis/celery.py
@@ -0,0 +1,17 @@
+"""
+Celery task queue setup for a Deis controller.
+"""
+
+from __future__ import absolute_import
+
+import os
+
+from celery import Celery
+from django.conf import settings
+
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'deis.settings')
+
+app = Celery('deis')
+app.config_from_object('django.conf:settings')
+app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
diff --git a/deis/settings.py b/deis/settings.py
@@ -148,7 +148,6 @@
     # Third-party apps
     'allauth',
     'allauth.account',
-    'djcelery',
     'json_field',
     'rest_framework',
     'south',
@@ -247,28 +246,16 @@
     }
 }
 
-# default celery settings
-
-import djcelery
 
+# celery task execution settings
 BROKER_URL = 'amqp://guest:guest@localhost:5672/'
-TEST_RUNNER = 'djcelery.contrib.test_runner.CeleryTestSuiteRunner'
-CELERY_RESULT_BACKEND = 'amqp'
-
-# normally False to execute tasks asyncronously
-# set to True to enable blocking execution for debugging
-CELERY_ALWAYS_EAGER = False
-EAGER_PROPAGATES_EXCEPTION = True
-
-# make sure we import the task modules
+CELERY_ACCEPT_CONTENT = ['pickle', 'json']
 CELERY_IMPORTS = ('api.tasks',)
-
-djcelery.setup_loader()
+CELERY_RESULT_BACKEND = 'amqp'
+CELERYD_CONCURRENCY = 8
 
 
 # default deis settings
-
-
 DEIS_LOG_DIR = os.path.abspath(os.path.join(__file__, '..', '..', 'logs'))
 LOG_LINES = 1000
 
diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -1,9 +1,8 @@
 # Deis controller requirements
 boto==2.19.0
-celery==3.0.22  # 3.0.23 errors, see https://github.com/opdemand/deis/issues/148
+celery==3.1.6
 Django==1.6.0
 django-allauth==0.15.0
-django-celery==3.0.23
 django-json-field==0.5.5
 django-yamlfield==0.5
 djangorestframework==2.3.9
diff --git a/docs/docs_requirements.txt b/docs/docs_requirements.txt
@@ -1,8 +1,7 @@
 # Deis requirements for Sphinx documentation generation
 boto==2.19.0
-celery==3.0.22  # 3.0.23 errors, see https://github.com/opdemand/deis/issues/148
+celery==3.1.6
 Django==1.6.0
-django-celery==3.0.23
 django-json-field==0.5.5
 djangorestframework==2.3.9
 dop==0.1.4
diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,8 @@
 # Deis controller requirements
 boto==2.19.0
-celery==3.0.22  # 3.0.23 errors, see https://github.com/opdemand/deis/issues/148
+celery==3.1.6
 Django==1.6.0
 django-allauth==0.15.0
-django-celery==3.0.23
 django-json-field==0.5.5
 django-yamlfield==0.5
 djangorestframework==2.3.9
