fix conflicting migrations

diff --git a/src/documents/migrations/1021_paperlesstask.py b/src/documents/migrations/1022_paperlesstask.py
similarity index 97%
rename from src/documents/migrations/1021_paperlesstask.py
rename to src/documents/migrations/1022_paperlesstask.py
index c42aba7c42293f2a94709715b0059731e7f3016f..f1ecb244fdc4ca8b8f4825047d4dfad914fb1802 100644 (file)
--- a/src/documents/migrations/1021_paperlesstask.py
+++ b/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 = [

diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 5365f389ef159a0696958f716b45b0e29b6fa6c4..3b9f29555aa491588a87bcf4d45d4113cb4afc6b 100644 (file)
--- a/src/documents/serialisers.py
+++ b/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):

diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index 373dc3e4753642a8e20f3e5ff325e95e2442dbc1..38fe6f07b1704e445b7c8b877d5cc7ae2b426f73 100644 (file)
--- a/src/documents/tests/test_api.py
+++ b/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)
\ No newline at end of file
+        self.assertEqual(len(response.data), 0)