Merge ae7f759 into 07bdd2a

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': {

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',

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'

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)

deis/settings.py

@@ -150,7 +150,6 @@
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
-    'djcelery',
     'json_field',
     'rest_framework',
     'south',
@@ -249,28 +248,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
 

dev_requirements.txt

@@ -1,9 +1,9 @@
 # Deis controller requirements
 boto==2.16.0
-celery==3.0.22  # 3.0.23 errors, see https://github.com/opdemand/deis/issues/148
+# TODO: update this to "celery==3.1.6" when it is published to pypi.python.org
+git+https://github.com/celery/celery.git@9b84b36f3a56e99e39d0642162e4f28413a6fd7a#egg=celery
 Django==1.6.0
 django-allauth==0.14.2
-django-celery==3.0.23
 django-json-field==0.5.5
 django-yamlfield==0.5
 djangorestframework==2.3.9

docs/docs_requirements.txt

@@ -1,8 +1,8 @@
 # Deis requirements for Sphinx documentation generation
 boto==2.16.0
-celery==3.0.22  # 3.0.23 errors, see https://github.com/opdemand/deis/issues/148
+# TODO: update this to "celery==3.1.6" when it is published to pypi.python.org
+git+https://github.com/celery/celery.git@9b84b36f3a56e99e39d0642162e4f28413a6fd7a#egg=celery
 Django==1.6.0
-django-celery==3.0.23
 django-json-field==0.5.5
 djangorestframework==2.3.9
 dop==0.1.4

requirements.txt

@@ -1,9 +1,9 @@
 # Deis controller requirements
 boto==2.16.0
-celery==3.0.22  # 3.0.23 errors, see https://github.com/opdemand/deis/issues/148
+# TODO: update this to "celery==3.1.6" when it is published to pypi.python.org
+git+https://github.com/celery/celery.git@9b84b36f3a56e99e39d0642162e4f28413a6fd7a#egg=celery
 Django==1.6.0
 django-allauth==0.14.2
-django-celery==3.0.23
 django-json-field==0.5.5
 django-yamlfield==0.5
 djangorestframework==2.3.9