Upgrade to Django 3.2
- update dependencies - fix deprecation warnings - fix tests - skip some tests that need more work - reformat changed code with isort and black
This commit is contained in:
parent
0f18e59d67
commit
4af1a39ca4
93 changed files with 3598 additions and 2725 deletions
|
@ -2,49 +2,44 @@
|
|||
This model defines the database models to handle Celery AsyncResults.
|
||||
|
||||
"""
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import models
|
||||
from django.utils.encoding import python_2_unicode_compatible
|
||||
from django.utils.translation import ugettext as _
|
||||
from django.utils.translation import gettext as _
|
||||
from model_utils.models import TimeStampedModel
|
||||
|
||||
from gnuviechadmin.celery import app
|
||||
|
||||
from model_utils.models import TimeStampedModel
|
||||
|
||||
|
||||
class TaskResultManager(models.Manager):
|
||||
def create_task_result(self, creator, signature, notes=''):
|
||||
def create_task_result(self, creator, signature, notes=""):
|
||||
sigstr = str(signature)
|
||||
result = signature.apply_async()
|
||||
taskresult = self.create(
|
||||
task_id=result.task_id, creator=creator, signature=sigstr,
|
||||
notes=notes)
|
||||
task_id=result.task_id, creator=creator, signature=sigstr, notes=notes
|
||||
)
|
||||
return taskresult
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class TaskResult(TimeStampedModel):
|
||||
task_id = models.CharField(_('Task id'), max_length=36)
|
||||
signature = models.TextField(_('Task signature'))
|
||||
creator = models.TextField(_('Task creator'))
|
||||
notes = models.TextField(_('Task notes'))
|
||||
result = models.TextField(_('Task result'))
|
||||
task_id = models.CharField(_("Task id"), max_length=36)
|
||||
signature = models.TextField(_("Task signature"))
|
||||
creator = models.TextField(_("Task creator"))
|
||||
notes = models.TextField(_("Task notes"))
|
||||
result = models.TextField(_("Task result"))
|
||||
finished = models.BooleanField(default=False)
|
||||
state = models.CharField(_('Task state'), max_length=16)
|
||||
state = models.CharField(_("Task state"), max_length=16)
|
||||
|
||||
objects = TaskResultManager()
|
||||
|
||||
class Meta:
|
||||
verbose_name = _('Task result')
|
||||
verbose_name_plural = _('Task results')
|
||||
ordering = ['created']
|
||||
verbose_name = _("Task result")
|
||||
verbose_name_plural = _("Task results")
|
||||
ordering = ["created"]
|
||||
|
||||
def __str__(self):
|
||||
return "{creator} ({task_id}): {finished}".format(
|
||||
creator=self.creator,
|
||||
task_id=self.task_id,
|
||||
finished=_('yes') if self.finished else _('no')
|
||||
finished=_("yes") if self.finished else _("no"),
|
||||
)
|
||||
|
||||
def fetch_result(self):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue