Fixes ruff not running isort against the codebase

src/paperless_mail/admin.py

@@ -1,6 +1,7 @@
 from django import forms
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _
+
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
 from paperless_mail.models import ProcessedMail

src/paperless_mail/apps.py

@@ -1,6 +1,7 @@
 from django.apps import AppConfig
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
+
 from paperless_mail.signals import mail_consumer_declaration
 
 

src/paperless_mail/mail.py

@@ -21,6 +21,16 @@ from django.conf import settings
 from django.db import DatabaseError
 from django.utils.timezone import is_naive
 from django.utils.timezone import make_aware
+from imap_tools import AND
+from imap_tools import NOT
+from imap_tools import MailBox
+from imap_tools import MailboxFolderSelectError
+from imap_tools import MailBoxUnencrypted
+from imap_tools import MailMessage
+from imap_tools import MailMessageFlags
+from imap_tools.mailbox import MailBoxTls
+from imap_tools.query import LogicOperator
+
 from documents.data_models import ConsumableDocument
 from documents.data_models import DocumentMetadataOverrides
 from documents.data_models import DocumentSource
@@ -28,15 +38,6 @@ from documents.loggers import LoggingMixin
 from documents.models import Correspondent
 from documents.parsers import is_mime_type_supported
 from documents.tasks import consume_file
-from imap_tools import AND
-from imap_tools import MailBox
-from imap_tools import MailboxFolderSelectError
-from imap_tools import MailBoxUnencrypted
-from imap_tools import MailMessage
-from imap_tools import MailMessageFlags
-from imap_tools import NOT
-from imap_tools.mailbox import MailBoxTls
-from imap_tools.query import LogicOperator
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
 from paperless_mail.models import ProcessedMail

src/paperless_mail/management/commands/mail_fetcher.py

@@ -1,4 +1,5 @@
 from django.core.management.base import BaseCommand
+
 from paperless_mail import tasks
 
 

src/paperless_mail/migrations/0001_initial.py

@@ -1,7 +1,8 @@
 # Generated by Django 3.1.3 on 2020-11-15 22:54
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0003_auto_20201118_1940.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.3 on 2020-11-18 19:40
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0004_mailrule_order.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.3 on 2020-11-21 21:51
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0005_help_texts.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.3 on 2020-11-22 10:36
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0006_auto_20210101_2340.py

@@ -1,7 +1,8 @@
 # Generated by Django 3.1.4 on 2021-01-01 23:40
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0007_auto_20210106_0138.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.5 on 2021-01-06 01:38
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0008_auto_20210516_0940.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.3 on 2021-05-16 09:40
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0009_alter_mailrule_action_alter_mailrule_folder.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.0.3 on 2022-03-28 17:40
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0009_mailrule_assign_tags.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.12 on 2022-03-11 15:00
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0012_alter_mailrule_assign_tags.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.12 on 2022-03-11 16:21
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0014_alter_mailrule_action.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.0.4 on 2022-04-18 22:57
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0015_alter_mailrule_action.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.0.4 on 2022-05-29 13:21
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0016_mailrule_consumption_scope.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.0.4 on 2022-07-11 22:02
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0017_mailaccount_owner_mailrule_owner.py

@@ -1,8 +1,9 @@
 # Generated by Django 4.1.3 on 2022-12-06 04:48
 
-from django.conf import settings
-from django.db import migrations, models
 import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0018_processedmail.py

@@ -1,9 +1,10 @@
 # Generated by Django 4.1.5 on 2023-03-03 18:38
 
-from django.conf import settings
-from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
+from django.conf import settings
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0019_mailrule_filter_to.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.1.7 on 2023-03-11 21:08
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0020_mailaccount_is_token.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.1.7 on 2023-03-22 17:51
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/migrations/0021_alter_mailaccount_password.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.1.7 on 2023-04-20 15:03
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

src/paperless_mail/models.py

@@ -1,8 +1,9 @@
-import documents.models as document_models
 from django.db import models
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
+import documents.models as document_models
+
 
 class MailAccount(document_models.ModelWithOwner):
     class Meta:

src/paperless_mail/parsers.py

@@ -10,13 +10,14 @@ from bleach import linkify
 from django.conf import settings
 from django.utils.timezone import is_naive
 from django.utils.timezone import make_aware
-from documents.parsers import DocumentParser
-from documents.parsers import make_thumbnail_from_pdf
-from documents.parsers import ParseError
 from humanfriendly import format_size
 from imap_tools import MailMessage
 from tika import parser
 
+from documents.parsers import DocumentParser
+from documents.parsers import ParseError
+from documents.parsers import make_thumbnail_from_pdf
+
 
 class MailDocumentParser(DocumentParser):
     """

src/paperless_mail/serialisers.py

@@ -1,10 +1,11 @@
+from rest_framework import serializers
+
 from documents.serialisers import CorrespondentField
 from documents.serialisers import DocumentTypeField
 from documents.serialisers import OwnedObjectSerializer
 from documents.serialisers import TagsField
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
-from rest_framework import serializers
 
 
 class ObfuscatedPasswordField(serializers.Field):

src/paperless_mail/tasks.py

@@ -1,6 +1,7 @@
 import logging
 
 from celery import shared_task
+
 from paperless_mail.mail import MailAccountHandler
 from paperless_mail.mail import MailError
 from paperless_mail.models import MailAccount

src/paperless_mail/tests/test_api.py

@@ -2,6 +2,9 @@ import json
 from unittest import mock
 
 from django.contrib.auth.models import User
+from rest_framework import status
+from rest_framework.test import APITestCase
+
 from documents.models import Correspondent
 from documents.models import DocumentType
 from documents.models import Tag
@@ -9,8 +12,6 @@ from documents.tests.utils import DirectoriesMixin
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
 from paperless_mail.tests.test_mail import BogusMailBox
-from rest_framework import status
-from rest_framework.test import APITestCase
 
 
 class TestAPIMailAccounts(DirectoriesMixin, APITestCase):

src/paperless_mail/tests/test_live_mail.py

@@ -2,11 +2,13 @@ import os
 
 import pytest
 from django.test import TestCase
+
 from paperless_mail.mail import MailAccountHandler
 from paperless_mail.mail import MailError
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
 
+
 # Only run if the environment is setup
 # And the environment is not empty (forks, I think)
 @pytest.mark.skipif(

src/paperless_mail/tests/test_mail.py

@@ -12,21 +12,22 @@ from unittest import mock
 from django.core.management import call_command
 from django.db import DatabaseError
 from django.test import TestCase
-from documents.models import Correspondent
-from documents.tests.utils import DirectoriesMixin
-from documents.tests.utils import FileSystemAssertsMixin
+from imap_tools import NOT
 from imap_tools import EmailAddress
 from imap_tools import FolderInfo
 from imap_tools import MailboxFolderSelectError
 from imap_tools import MailboxLoginError
 from imap_tools import MailMessage
 from imap_tools import MailMessageFlags
-from imap_tools import NOT
+
+from documents.models import Correspondent
+from documents.tests.utils import DirectoriesMixin
+from documents.tests.utils import FileSystemAssertsMixin
 from paperless_mail import tasks
-from paperless_mail.mail import apply_mail_action
 from paperless_mail.mail import MailAccountHandler
 from paperless_mail.mail import MailError
 from paperless_mail.mail import TagMailAction
+from paperless_mail.mail import apply_mail_action
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
 

src/paperless_mail/tests/test_parsers.py

@@ -3,6 +3,7 @@ import os
 from unittest import mock
 
 from django.test import TestCase
+
 from documents.parsers import ParseError
 from documents.tests.utils import FileSystemAssertsMixin
 from paperless_mail.parsers import MailDocumentParser

src/paperless_mail/tests/test_parsers_live.py

@@ -6,13 +6,14 @@ from urllib.request import urlopen
 
 import pytest
 from django.test import TestCase
-from documents.parsers import run_convert
-from documents.tests.utils import FileSystemAssertsMixin
 from imagehash import average_hash
-from paperless_mail.parsers import MailDocumentParser
 from pdfminer.high_level import extract_text
 from PIL import Image
 
+from documents.parsers import run_convert
+from documents.tests.utils import FileSystemAssertsMixin
+from paperless_mail.parsers import MailDocumentParser
+
 
 class TestParserLive(FileSystemAssertsMixin, TestCase):
     SAMPLE_FILES = os.path.join(os.path.dirname(__file__), "samples")

src/paperless_mail/views.py

@@ -2,20 +2,21 @@ import datetime
 import logging
 
 from django.http import HttpResponseBadRequest
-from documents.views import PassUserMixin
-from paperless.views import StandardPagination
-from paperless_mail.mail import get_mailbox
-from paperless_mail.mail import mailbox_login
-from paperless_mail.mail import MailError
-from paperless_mail.models import MailAccount
-from paperless_mail.models import MailRule
-from paperless_mail.serialisers import MailAccountSerializer
-from paperless_mail.serialisers import MailRuleSerializer
 from rest_framework.generics import GenericAPIView
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet
 
+from documents.views import PassUserMixin
+from paperless.views import StandardPagination
+from paperless_mail.mail import MailError
+from paperless_mail.mail import get_mailbox
+from paperless_mail.mail import mailbox_login
+from paperless_mail.models import MailAccount
+from paperless_mail.models import MailRule
+from paperless_mail.serialisers import MailAccountSerializer
+from paperless_mail.serialisers import MailRuleSerializer
+
 
 class MailAccountViewSet(ModelViewSet, PassUserMixin):
     model = MailAccount