Merge pull request #766 from edx/ammar/remove-django-celery

Remove django-celery

requirements/base.txt

@@ -12,9 +12,7 @@ git+https://github.com/edx/edx-submissions.git@muzaffar/upgrage-django-1.8#egg=e
 boto>=2.32.1,<3.0.0
 celery==3.1.18
 defusedxml==0.4.1
-#django>=1.8,<1.9
-django==1.8.5
-django-celery==3.1.16
+django>=1.8,<1.9
 django-extensions==1.5.9
 django-model-utils==2.3.1
 djangorestframework>=3.1,<3.3

settings/base.py

@@ -3,7 +3,7 @@ Base settings for ORA2.
 """
 
 import os
-import sys
+from celery import Celery
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -121,7 +121,6 @@ INSTALLED_APPS = (
 
     # Third party
     'django_extensions',
-    'djcelery',
 
     # XBlock
     'workbench',
@@ -150,13 +149,14 @@ CACHES = {
 
 BASE_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 
-# Celery configuration
-# Note: Version 3.1 of Celery includes Django support, but since we're using
-# version 3.0 (same as edx-platform), we need to use an external library.
-import djcelery
-djcelery.setup_loader()
+# Celery initialization and configuration
 
-# We run Celery in "always eager" mode in the test suite and local dev,
-# which executes tasks synchronously instead of using the task queue.
-CELERY_ALWAYS_EAGER = True
-CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
+class Config:
+    # We run Celery in "always eager" mode in the test suite and local dev,
+    # which executes tasks synchronously instead of using the task queue.
+    CELERY_ALWAYS_EAGER = True
+    CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
+
+APP = Celery()
+APP.config_from_object(Config)
+APP.autodiscover_tasks(lambda: INSTALLED_APPS)