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

gnuviechadmin/taskresults/management/commands/fetch_taskresults.py

@@ -4,8 +4,6 @@ results of all `Celery <http://www.celeryproject.org/>`_ tasks that are not
 marked as finished yet.
 
 """
-from __future__ import unicode_literals
-
 from django.core.management.base import BaseCommand
 
 from taskresults.models import TaskResult

gnuviechadmin/taskresults/migrations/0001_initial.py

@@ -1,28 +1,35 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='TaskResult',
+            name="TaskResult",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('task_id', models.CharField(max_length=36, verbose_name='Task id')),
-                ('task_name', models.CharField(max_length=64, verbose_name='Task name')),
-                ('result', models.TextField(verbose_name='Task result')),
-                ('finished', models.BooleanField(default=False)),
-                ('state', models.CharField(max_length=16, verbose_name='Task state')),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("task_id", models.CharField(max_length=36, verbose_name="Task id")),
+                (
+                    "task_name",
+                    models.CharField(max_length=64, verbose_name="Task name"),
+                ),
+                ("result", models.TextField(verbose_name="Task result")),
+                ("finished", models.BooleanField(default=False)),
+                ("state", models.CharField(max_length=16, verbose_name="Task state")),
             ],
             options={
-                'verbose_name': 'Task result',
-                'verbose_name_plural': 'Task results',
+                "verbose_name": "Task result",
+                "verbose_name_plural": "Task results",
             },
             bases=(models.Model,),
         ),

gnuviechadmin/taskresults/migrations/0002_auto_20151011_2248.py

@@ -1,36 +1,33 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('taskresults', '0001_initial'),
+        ("taskresults", "0001_initial"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='taskresult',
-            name='task_name',
+            model_name="taskresult",
+            name="task_name",
         ),
         migrations.AddField(
-            model_name='taskresult',
-            name='creator',
-            field=models.TextField(default='migrated', verbose_name='Task creator'),
+            model_name="taskresult",
+            name="creator",
+            field=models.TextField(default="migrated", verbose_name="Task creator"),
             preserve_default=False,
         ),
         migrations.AddField(
-            model_name='taskresult',
-            name='notes',
-            field=models.TextField(default='', verbose_name='Task notes'),
+            model_name="taskresult",
+            name="notes",
+            field=models.TextField(default="", verbose_name="Task notes"),
             preserve_default=False,
         ),
         migrations.AddField(
-            model_name='taskresult',
-            name='signature',
-            field=models.TextField(default='', verbose_name='Task signature'),
+            model_name="taskresult",
+            name="signature",
+            field=models.TextField(default="", verbose_name="Task signature"),
             preserve_default=False,
         ),
     ]

gnuviechadmin/taskresults/migrations/0003_auto_20160109_1524.py

@@ -1,31 +1,40 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.1 on 2016-01-09 14:24
-from __future__ import unicode_literals
-
-from django.db import migrations
 import django.utils.timezone
 import model_utils.fields
+from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('taskresults', '0002_auto_20151011_2248'),
+        ("taskresults", "0002_auto_20151011_2248"),
     ]
 
     operations = [
         migrations.AlterModelOptions(
-            name='taskresult',
-            options={'ordering': ['created'], 'verbose_name': 'Task result', 'verbose_name_plural': 'Task results'},
+            name="taskresult",
+            options={
+                "ordering": ["created"],
+                "verbose_name": "Task result",
+                "verbose_name_plural": "Task results",
+            },
         ),
         migrations.AddField(
-            model_name='taskresult',
-            name='created',
-            field=model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created'),
+            model_name="taskresult",
+            name="created",
+            field=model_utils.fields.AutoCreatedField(
+                default=django.utils.timezone.now,
+                editable=False,
+                verbose_name="created",
+            ),
         ),
         migrations.AddField(
-            model_name='taskresult',
-            name='modified',
-            field=model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified'),
+            model_name="taskresult",
+            name="modified",
+            field=model_utils.fields.AutoLastModifiedField(
+                default=django.utils.timezone.now,
+                editable=False,
+                verbose_name="modified",
+            ),
         ),
     ]

gnuviechadmin/taskresults/models.py

@@ -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):