Download as
Browse Code »

Commit 29117f5a3f94da085f6561faef11d9860e093003

Authored by Sergio Oliveira
1 parent d6f2d2fb
Exists in master and in 30 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd

django-celery not needed

Showing 5 changed files with 1 additions and 53 deletions   Show diff stats
colab/celery.py
  Diff comments   View file @29117f5
@@ -14,13 +14,6 @@ app = Celery('colab') @@ -14,13 +14,6 @@ app = Celery('colab')
14 app.config_from_object('django.conf:settings') 14 app.config_from_object('django.conf:settings')
15 app.autodiscover_tasks(lambda: settings.INSTALLED_APPS) 15 app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
16 16
17 -app.conf.update(  
18 - CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend',  
19 -)  
20 -app.conf.update(  
21 - CELERY_RESULT_BACKEND='djcelery.backends.cache:CacheBackend',  
22 -)  
23 -  
24 17
25 @app.task(bind=True) 18 @app.task(bind=True)
26 def debug_task(self): 19 def debug_task(self):
colab/plugins/gitlab/celery.py
View file @d6f2d2f
@@ -1,22 +0,0 @@ @@ -1,22 +0,0 @@
1 -from __future__ import absolute_import  
2 -  
3 -import os  
4 -  
5 -from celery import Celery  
6 -  
7 -# set the default Django settings module for the 'celery' program.  
8 -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'colab.settings')  
9 -  
10 -from django.conf import settings  
11 -  
12 -app = Celery('colab')  
13 -  
14 -app.config_from_object('django.conf:settings')  
15 -app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)  
16 -  
17 -app.conf.update(  
18 - CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend',  
19 -)  
20 -app.conf.update(  
21 - CELERY_RESULT_BACKEND='djcelery.backends.cache:CacheBackend',  
22 -)  
colab/settings.py
  Diff comments   View file @29117f5
@@ -47,7 +47,6 @@ INSTALLED_APPS = ( @@ -47,7 +47,6 @@ INSTALLED_APPS = (
47 'haystack', 47 'haystack',
48 'hitcounter', 48 'hitcounter',
49 'taggit', 49 'taggit',
50 - 'djcelery',  
51 50
52 # Own apps 51 # Own apps
53 'colab.home', 52 'colab.home',
colab/signals/celery.py
View file @d6f2d2f
@@ -1,22 +0,0 @@ @@ -1,22 +0,0 @@
1 -from __future__ import absolute_import  
2 -  
3 -import os  
4 -  
5 -from celery import Celery  
6 -  
7 -# set the default Django settings module for the 'celery' program.  
8 -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'colab.settings')  
9 -  
10 -from django.conf import settings  
11 -  
12 -app = Celery('colab')  
13 -  
14 -app.config_from_object('django.conf:settings')  
15 -app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)  
16 -  
17 -app.conf.update(  
18 - CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend',  
19 -)  
20 -app.conf.update(  
21 - CELERY_RESULT_BACKEND='djcelery.backends.cache:CacheBackend',  
22 -)  
@@ -16,7 +16,7 @@ REQUIREMENTS = [ @@ -16,7 +16,7 @@ REQUIREMENTS = [
16 'diazo>=1.0.5', 16 'diazo>=1.0.5',
17 17
18 # Async Signals 18 # Async Signals
19 - 'django-celery==3.1.16', 19 + 'celery>=3.1',
20 20
21 ### Move out of colab (as plugins): 21 ### Move out of colab (as plugins):
22 22