diff --git a/colab/celery.py b/colab/celery.py index 5c6e1eb..6bd2d25 100644 --- a/colab/celery.py +++ b/colab/celery.py @@ -14,13 +14,6 @@ app = Celery('colab') app.config_from_object('django.conf:settings') app.autodiscover_tasks(lambda: settings.INSTALLED_APPS) -app.conf.update( - CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend', -) -app.conf.update( - CELERY_RESULT_BACKEND='djcelery.backends.cache:CacheBackend', -) - @app.task(bind=True) def debug_task(self): diff --git a/colab/plugins/gitlab/celery.py b/colab/plugins/gitlab/celery.py deleted file mode 100644 index 6d19e21..0000000 --- a/colab/plugins/gitlab/celery.py +++ /dev/null @@ -1,22 +0,0 @@ -from __future__ import absolute_import - -import os - -from celery import Celery - -# set the default Django settings module for the 'celery' program. -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'colab.settings') - -from django.conf import settings - -app = Celery('colab') - -app.config_from_object('django.conf:settings') -app.autodiscover_tasks(lambda: settings.INSTALLED_APPS) - -app.conf.update( - CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend', -) -app.conf.update( - CELERY_RESULT_BACKEND='djcelery.backends.cache:CacheBackend', -) diff --git a/colab/settings.py b/colab/settings.py index 6f98e25..7498880 100644 --- a/colab/settings.py +++ b/colab/settings.py @@ -47,7 +47,6 @@ INSTALLED_APPS = ( 'haystack', 'hitcounter', 'taggit', - 'djcelery', # Own apps 'colab.home', diff --git a/colab/signals/celery.py b/colab/signals/celery.py deleted file mode 100644 index 6d19e21..0000000 --- a/colab/signals/celery.py +++ /dev/null @@ -1,22 +0,0 @@ -from __future__ import absolute_import - -import os - -from celery import Celery - -# set the default Django settings module for the 'celery' program. -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'colab.settings') - -from django.conf import settings - -app = Celery('colab') - -app.config_from_object('django.conf:settings') -app.autodiscover_tasks(lambda: settings.INSTALLED_APPS) - -app.conf.update( - CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend', -) -app.conf.update( - CELERY_RESULT_BACKEND='djcelery.backends.cache:CacheBackend', -) diff --git a/setup.py b/setup.py index 2eadb06..ef8fb19 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ REQUIREMENTS = [ 'diazo>=1.0.5', # Async Signals - 'django-celery==3.1.16', + 'celery>=3.1', ### Move out of colab (as plugins): -- libgit2 0.21.2