diff --git a/mayan/settings/base.py b/mayan/settings/base.py index d42b0c9682..1ba427270c 100644 --- a/mayan/settings/base.py +++ b/mayan/settings/base.py @@ -45,11 +45,9 @@ INSTALLED_APPS = ( 'django.contrib.sites', 'django.contrib.staticfiles', # 3rd party - 'djcelery', 'compressor', 'corsheaders', 'filetransfers', - 'kombu.transport.django', 'mptt', 'rest_framework', 'rest_framework.authtoken', @@ -260,9 +258,8 @@ REST_FRAMEWORK = { ) } # ----------- Celery ---------- -BROKER_URL = 'django://' -CELERY_RESULT_BACKEND = 'djcelery.backends.database:DatabaseBackend' CELERY_TIMEZONE = 'UTC' CELERY_ENABLE_UTC = True +CELERY_ALWAYS_EAGER = True #------------ CORS ------------ CORS_ORIGIN_ALLOW_ALL = True diff --git a/requirements/common.txt b/requirements/common.txt index bebc8b4dfd..b048511049 100644 --- a/requirements/common.txt +++ b/requirements/common.txt @@ -4,7 +4,6 @@ celery==3.1.15 cssmin==0.2.0 Django==1.6.7 -django-celery==3.1.16 django-filetransfers==0.1.0 django-pagination==1.0.7 django-compressor==1.4