# HG changeset patch # User ymh # Date 1425855203 -3600 # Node ID 09aa28e25840e3b13361f3a66a6fd974e63d8888 # Parent 19220d52bce7bc9cbfab7feb0cab670c8f86de37 send email with celery diff -r 19220d52bce7 -r 09aa28e25840 src/hdalab/config.py.tmpl --- a/src/hdalab/config.py.tmpl Sun Mar 08 14:53:52 2015 +0100 +++ b/src/hdalab/config.py.tmpl Sun Mar 08 23:53:23 2015 +0100 @@ -127,3 +127,5 @@ RENKAN_PREVIEW_PHANTOMJS_PATH = 'phantomjs' BROKER_URL = 'sqla+sqlite:///'+os.path.abspath(os.path.join(BASE_DIR,"../../run/celerydb.sqlite")) + +#CELERY_EMAIL_BACKEND diff -r 19220d52bce7 -r 09aa28e25840 src/hdalab/settings.py --- a/src/hdalab/settings.py Sun Mar 08 14:53:52 2015 +0100 +++ b/src/hdalab/settings.py Sun Mar 08 23:53:23 2015 +0100 @@ -149,6 +149,7 @@ 'django.contrib.staticfiles', 'django.contrib.admin', 'django_extensions', + "djcelery_email", 'registration', 'haystack', 'easy_thumbnails', @@ -183,6 +184,8 @@ CELERY_TASK_SERIALIZER = 'json' CELERY_ACCEPT_CONTENT = ['json', 'msgpack', 'yaml'] +EMAIL_BACKEND = 'djcelery_email.backends.CeleryEmailBackend' + from hdalab.config import * #@UnusedWildImport if 'LOGIN_REDIRECT_URL' not in locals(): diff -r 19220d52bce7 -r 09aa28e25840 src/hdalab/tasks.py --- a/src/hdalab/tasks.py Sun Mar 08 14:53:52 2015 +0100 +++ b/src/hdalab/tasks.py Sun Mar 08 23:53:23 2015 +0100 @@ -7,9 +7,11 @@ from __future__ import absolute_import from celery import shared_task + from hdalab.models.renkan import HdalabRenkan from hdalab.services import renkan_capture_preview + @shared_task def capture_preview(rk_id): diff -r 19220d52bce7 -r 09aa28e25840 virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Sun Mar 08 14:53:52 2015 +0100 +++ b/virtualenv/res/lib/lib_create_env.py Sun Mar 08 23:53:23 2015 +0100 @@ -55,6 +55,8 @@ 'ANYJSON': { 'setup': 'anyjson', 'url':'https://bitbucket.org/runeh/anyjson/get/0.3.3.tar.gz', 'local':"anyjson-0.3.3.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'BILLIARD': { 'setup': 'billiard', 'url':'https://github.com/celery/billiard/archive/v3.3.0.19.tar.gz', 'local':"billiard-3.3.0.19.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'CELERY': { 'setup': 'celery', 'url':'https://github.com/celery/celery/archive/v3.1.17.tar.gz', 'local':"celery-3.1.17.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'APPCONF': { 'setup': 'django-appconf', 'url':'https://github.com/jezdez/django-appconf/archive/v1.0.1.tar.gz', 'local':"django-appconf-1.0.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'CELERY-EMAIL': { 'setup': 'django-celery-email', 'url':'https://github.com/pmclanahan/django-celery-email/archive/1.1.0.tar.gz', 'local':"django-celery-email-1.1.0.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, } diff -r 19220d52bce7 -r 09aa28e25840 virtualenv/res/src/django-appconf-1.0.1.tar.gz Binary file virtualenv/res/src/django-appconf-1.0.1.tar.gz has changed diff -r 19220d52bce7 -r 09aa28e25840 virtualenv/res/src/django-celery-email-1.1.0.tar.gz Binary file virtualenv/res/src/django-celery-email-1.1.0.tar.gz has changed diff -r 19220d52bce7 -r 09aa28e25840 virtualenv/res/src/django-registration-0.8.tar.gz Binary file virtualenv/res/src/django-registration-0.8.tar.gz has changed diff -r 19220d52bce7 -r 09aa28e25840 virtualenv/res/src/redland-1.0.11.tar.gz Binary file virtualenv/res/src/redland-1.0.11.tar.gz has changed diff -r 19220d52bce7 -r 09aa28e25840 virtualenv/res/src/wikitools-1.1.1.tar.bz2 Binary file virtualenv/res/src/wikitools-1.1.1.tar.bz2 has changed diff -r 19220d52bce7 -r 09aa28e25840 virtualenv/web/res/requirements.txt --- a/virtualenv/web/res/requirements.txt Sun Mar 08 14:53:52 2015 +0100 +++ b/virtualenv/web/res/requirements.txt Sun Mar 08 23:53:23 2015 +0100 @@ -5,6 +5,7 @@ Pillow==2.6.1 PyYAML==3.11 SPARQLWrapper==1.6.4 +SQLAlchemy==0.9.8 South==1.0.1 Unidecode==0.04.17 Whoosh==2.5.7 @@ -12,6 +13,8 @@ anyjson==0.3.3 billiard==3.3.0.19 celery==3.1.17 +django-appconf==1.0.1 +django-celery-email==1.1.0 django-extensions==1.4.4 django-haystack==2.2.0 django-registration-redux==1.1 @@ -29,8 +32,7 @@ rdflib==4.2.0-dev requests==2.4.3 simplejson==3.6.5 -six==1.8.0 -sqlalchemy==0.9.8 +six==1.9.0 urllib3==1.9.1 wikitools==1.2 wsgiref==0.1.2