--- a/server/src/metaeducation/__init__.py Tue Jul 05 14:03:55 2016 +0200
+++ b/server/src/metaeducation/__init__.py Tue Jul 12 17:40:02 2016 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 0, 15, "final", 0)
+VERSION = (0, 0, 16, "final", 0)
VERSION_STR = ".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))
--- a/server/src/metaeducation/celery.py Tue Jul 05 14:03:55 2016 +0200
+++ b/server/src/metaeducation/celery.py Tue Jul 12 17:40:02 2016 +0200
@@ -11,5 +11,5 @@
# Using a string here means the worker will not have to
# pickle the object when using Windows.
-app.config_from_object('django.conf:settings')
-app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
+app.config_from_object('django.conf:settings', namespace='CELERY')
+app.autodiscover_tasks()
--- a/server/src/metaeducation/settings/dev.py.tmpl Tue Jul 05 14:03:55 2016 +0200
+++ b/server/src/metaeducation/settings/dev.py.tmpl Tue Jul 12 17:40:02 2016 +0200
@@ -2,10 +2,6 @@
from metaeducation.settings import *
import os, logging, base64
-INSTALLED_APPS += ('kombu.transport.django',)
-
-BROKER_URL = 'django://'
-
BASE_URL = '/'
WEB_URL = ''
@@ -133,5 +129,12 @@
LRS_TRACKING_SERVICE_URL = "" # URL of the LRS to which we send tracking data
LRS_MTDC_RENKAN_USERNAME = "" # Username of Renkan app for LRS auth
LRS_MTDC_RENKAN_PASSWORD = "" # Password of Renkan app for LRS auth
-TRACKING_RNKNS_NAMESPACE = "" # Namespace for renkan nodes and edges URI, must be of the format "http://{something}/"
-TRACKING_VOCABULARY_NAMESPACE = "" # Namespace for tracking custom vocabulary, must be of the format "http://{something}/"
+
+CELERY_BROKER_URL = 'filesystem://'
+
+CELERY_BROKER_TRANSPORT_OPTIONS = {
+ "data_folder_in": os.path.abspath(os.path.join(BASE_DIR,"../run/broker/out")),
+ "data_folder_out": os.path.abspath(os.path.join(BASE_DIR,"../run/broker/out")),
+ "data_folder_processed": os.path.abspath(os.path.join(BASE_DIR,"../run/broker/processed")),
+}
+
--- a/server/src/requirement.txt Tue Jul 05 14:03:55 2016 +0200
+++ b/server/src/requirement.txt Tue Jul 12 17:40:02 2016 +0200
@@ -11,4 +11,7 @@
requests==2.9.1
requests-oauthlib==0.6.0
six==1.10.0
-celery==3.1.23
+vine==1.1.1
+-e git+https://github.com/celery/kombu.git#egg=kombu
+-e git+https://github.com/celery/billiard.git#egg=billiard
+celery==4.0.0rc3
--- a/server/src/requirement_iri.txt Tue Jul 05 14:03:55 2016 +0200
+++ b/server/src/requirement_iri.txt Tue Jul 12 17:40:02 2016 +0200
@@ -1,1 +1,1 @@
-renkanmanager (==0.12.19)
+renkanmanager (==0.12.20)