From 6b71ca96163a635b8add442a0a3f7a3dd87ca981 Mon Sep 17 00:00:00 2001
From: Marco Ciotola <848222@stud.unive.it>
Date: Tue, 19 Feb 2019 01:10:51 +0100
Subject: [PATCH] Upgrade celery
---
helios/tasks.py | 15 ++++++---------
requirements.txt | 6 +++---
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/helios/tasks.py b/helios/tasks.py
index 5f7bba8..d550afc 100644
--- a/helios/tasks.py
+++ b/helios/tasks.py
@@ -4,16 +4,15 @@ Celery queued tasks for Helios
2010-08-01
ben@adida.net
"""
+import copy
-from celery.decorators import task
+from celery.task import task
+from celery.utils.log import get_logger
-from models import *
-from view_utils import render_template_raw
import signals
+from models import CastVote, Election, Voter, VoterFile
+from view_utils import render_template_raw
-import copy
-
-from django.conf import settings
@task()
def cast_vote_verify_and_store(cast_vote_id, status_update_message=None, **kwargs):
@@ -29,11 +28,9 @@ def cast_vote_verify_and_store(cast_vote_id, status_update_message=None, **kwarg
signals.vote_cast.send(sender=election, election=election, user=user, voter=voter, cast_vote=cast_vote)
if status_update_message and user.can_update_status():
- from views import get_election_url
-
user.update_status(status_update_message)
else:
- logger = cast_vote_verify_and_store.get_logger(**kwargs)
+ logger = get_logger(cast_vote_verify_and_store.__name__)
logger.error("Failed to verify and store %d" % cast_vote_id)
@task()
diff --git a/requirements.txt b/requirements.txt
index 237e75c..0e0c0e8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
Django==1.8.19
anyjson==0.3.3
-celery==3.1.18
-django-celery==3.1.16
+celery==3.1.25
+django-celery==3.2.2
django-picklefield==0.3.0
-kombu==3.0.30
+kombu==3.0.37
html5lib==0.999
psycopg2==2.7.3.2
pyparsing==1.5.7
--
GitLab