fix conflicting migrations

src/documents/migrations/1022_paperlesstask.py

@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("django_q", "0014_schedule_cluster"),
-        ("documents", "1020_merge_20220518_1839"),
+        ("documents", "1021_webp_thumbnail_conversion"),
     ]
 
     operations = [

src/documents/serialisers.py

@@ -649,7 +649,7 @@ class AcknowledgeTasksViewSerializer(serializers.Serializer):
         count = PaperlessTask.objects.filter(id__in=tasks).count()
         if not count == len(tasks):
             raise serializers.ValidationError(
-                f"Some tasks in {name} don't exist or were " f"specified twice.",
+                f"Some tasks in {name} don't exist or were specified twice.",
             )
 
     def validate_tasks(self, tasks):

src/documents/tests/test_api.py

@@ -2661,7 +2661,6 @@ class TestTasks(APITestCase):
         self.client.force_authenticate(user=self.user)
 
     def test_get_tasks(self):
-
         task_id1 = str(uuid.uuid4())
         PaperlessTask.objects.create(task_id=task_id1)
         Task.objects.create(
@@ -2687,7 +2686,6 @@ class TestTasks(APITestCase):
         self.assertIsNone(returned_task2["attempted_task"])
 
     def test_acknowledge_tasks(self):
-
         task_id = str(uuid.uuid4())
         task = PaperlessTask.objects.create(task_id=task_id)
 
@@ -2701,4 +2699,4 @@ class TestTasks(APITestCase):
         self.assertEqual(response.status_code, 200)
 
         response = self.client.get(self.ENDPOINT)
-        self.assertEqual(len(response.data), 0)
+        self.assertEqual(len(response.data), 0)