Add isort

.github/workflows/test.yml

@@ -16,7 +16,16 @@ jobs:
       - uses: chartboost/ruff-action@v1
         with:
           version: 0.4.8
-          args: 'format --check'    
+          args: 'format --check'
+
+  ruff-lint:
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    steps:
+      - uses: actions/checkout@v4
+      - uses: chartboost/ruff-action@v1
+        with:
+          version: 0.4.8
 
   build:
     runs-on: ubuntu-latest

post_office/__init__.py

@@ -1,5 +1,6 @@
 from ast import literal_eval
-from os.path import dirname, join
+from os.path import dirname
+from os.path import join
 
 with open(join(dirname(__file__), 'version.txt')) as fh:
     VERSION = literal_eval(fh.read())

post_office/admin.py

@@ -2,21 +2,30 @@
 
 from django import forms
 from django.conf import settings
-from django.contrib import admin, messages
+from django.contrib import admin
+from django.contrib import messages
 from django.core.exceptions import ValidationError
 from django.core.mail.message import SafeMIMEText
 from django.db import models
 from django.forms import BaseInlineFormSet
 from django.forms.widgets import TextInput
-from django.http.response import HttpResponse, HttpResponseNotFound, HttpResponseRedirect
-from django.template import Context, Template
-from django.urls import re_path, reverse
+from django.http.response import HttpResponse
+from django.http.response import HttpResponseNotFound
+from django.http.response import HttpResponseRedirect
+from django.template import Context
+from django.template import Template
+from django.urls import re_path
+from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.text import Truncator
 from django.utils.translation import gettext_lazy as _
 
 from .fields import CommaSeparatedEmailField
-from .models import STATUS, Attachment, Email, EmailTemplate, Log
+from .models import STATUS
+from .models import Attachment
+from .models import Email
+from .models import EmailTemplate
+from .models import Log
 from .sanitizer import clean_html
 
 

post_office/backends.py

@@ -1,7 +1,9 @@
 from collections import OrderedDict
 from email.mime.base import MIMEBase
+
 from django.core.files.base import ContentFile
 from django.core.mail.backends.base import BaseEmailBackend
+
 from .settings import get_default_priority
 
 
@@ -18,9 +20,10 @@ def send_messages(self, email_messages):
         email messages sent.
         """
         from .mail import create
-        from .models import STATUS, Email
-        from .utils import create_attachments
+        from .models import STATUS
+        from .models import Email
         from .signals import email_queued
+        from .utils import create_attachments
 
         if not email_messages:
             return

post_office/mail.py

@@ -1,37 +1,41 @@
+from email.utils import make_msgid
+from multiprocessing import Pool
+from multiprocessing.dummy import Pool as ThreadPool
+
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import connection as db_connection
 from django.db.models import Q
-from django.template import Context, Template
+from django.template import Context
+from django.template import Template
 from django.utils import timezone
-from email.utils import make_msgid
-from multiprocessing import Pool
-from multiprocessing.dummy import Pool as ThreadPool
 
 from .connections import connections
-from .lockfile import default_lockfile, FileLock, FileLocked
+from .lockfile import FileLock
+from .lockfile import FileLocked
+from .lockfile import default_lockfile
 from .logutils import setup_loghandlers
-from .models import Email, EmailTemplate, Log, PRIORITY, STATUS
-from .settings import (
-    get_available_backends,
-    get_batch_delivery_timeout,
-    get_batch_size,
-    get_log_level,
-    get_max_retries,
-    get_message_id_enabled,
-    get_message_id_fqdn,
-    get_retry_timedelta,
-    get_sending_order,
-    get_threads_per_process,
-)
+from .models import PRIORITY
+from .models import STATUS
+from .models import Email
+from .models import EmailTemplate
+from .models import Log
+from .settings import get_available_backends
+from .settings import get_batch_delivery_timeout
+from .settings import get_batch_size
+from .settings import get_log_level
+from .settings import get_max_retries
+from .settings import get_message_id_enabled
+from .settings import get_message_id_fqdn
+from .settings import get_retry_timedelta
+from .settings import get_sending_order
+from .settings import get_threads_per_process
 from .signals import email_queued
-from .utils import (
-    create_attachments,
-    get_email_template,
-    parse_emails,
-    parse_priority,
-    split_emails,
-)
+from .utils import create_attachments
+from .utils import get_email_template
+from .utils import parse_emails
+from .utils import parse_priority
+from .utils import split_emails
 
 logger = setup_loghandlers('INFO')
 

post_office/migrations/0001_initial.py

@@ -1,8 +1,9 @@
-from django.db import models, migrations
+from django.db import migrations
+from django.db import models
 
 import post_office.fields
-import post_office.validators
 import post_office.models
+import post_office.validators
 
 
 class Migration(migrations.Migration):

post_office/migrations/0002_add_i18n_and_backend_alias.py

@@ -1,6 +1,8 @@
-from django.db import models, migrations
-import post_office.validators
+from django.db import migrations
+from django.db import models
+
 import post_office.fields
+import post_office.validators
 
 
 class Migration(migrations.Migration):

post_office/migrations/0003_longer_subject.py

@@ -1,5 +1,6 @@
 # Generated by Django 1.9 on 2016-02-04 08:08
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

post_office/migrations/0004_auto_20160607_0901.py

@@ -1,6 +1,7 @@
 # Generated by Django 1.9.6 on 2016-06-07 07:01
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations
+from django.db import models
 
 import post_office.models
 

post_office/migrations/0006_attachment_mimetype.py

@@ -1,4 +1,5 @@
-from django.db import models, migrations
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

post_office/migrations/0008_attachment_headers.py

@@ -1,5 +1,6 @@
 # Generated by Django 1.11.16 on 2018-11-30 08:54
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

post_office/migrations/0009_requeued_mode.py

@@ -1,6 +1,7 @@
 # Generated by Django 2.2.11 on 2020-05-10 08:59
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

post_office/migrations/0010_message_id.py

@@ -1,8 +1,11 @@
 import random
-from django.db import migrations, models
+
+from django.db import migrations
+from django.db import models
 
 from post_office.models import STATUS
-from post_office.settings import get_message_id_enabled, get_message_id_fqdn
+from post_office.settings import get_message_id_enabled
+from post_office.settings import get_message_id_fqdn
 
 
 def forwards(apps, schema_editor):

post_office/migrations/0011_models_help_text.py

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

post_office/models.py

@@ -1,24 +1,28 @@
 import os
-
 from collections import namedtuple
-from uuid import uuid4
 from email.mime.nonmultipart import MIMENonMultipart
+from uuid import uuid4
 
 from django.core.exceptions import ValidationError
-from django.core.mail import EmailMessage, EmailMultiAlternatives
+from django.core.mail import EmailMessage
+from django.core.mail import EmailMultiAlternatives
 from django.db import models
-from django.utils.encoding import smart_str
-from django.utils.translation import pgettext_lazy, gettext_lazy as _
 from django.utils import timezone
+from django.utils.encoding import smart_str
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import pgettext_lazy
 
 from post_office import cache
 from post_office.fields import CommaSeparatedEmailField
 
 from .connections import connections
 from .logutils import setup_loghandlers
-from .settings import context_field_class, get_log_level, get_template_engine, get_override_recipients
-from .validators import validate_email_with_name, validate_template_syntax
-
+from .settings import context_field_class
+from .settings import get_log_level
+from .settings import get_override_recipients
+from .settings import get_template_engine
+from .validators import validate_email_with_name
+from .validators import validate_template_syntax
 
 logger = setup_loghandlers('INFO')
 

post_office/sanitizer.py

@@ -1,4 +1,5 @@
-from django.utils.html import mark_safe, format_html
+from django.utils.html import format_html
+from django.utils.html import mark_safe
 from django.utils.translation import gettext_lazy
 
 try:

post_office/settings.py

@@ -1,15 +1,13 @@
+import datetime
 import warnings
 
 from django.conf import settings
 from django.core.cache import caches
 from django.core.cache.backends.base import InvalidCacheBackendError
 from django.core.mail.utils import DNS_NAME
 from django.template import engines as template_engines
-
 from django.utils.module_loading import import_string
 
-import datetime
-
 
 def get_backend(alias='default'):
     return get_available_backends()[alias]

post_office/template/__init__.py

@@ -1,4 +1,5 @@
-from django.template.loader import get_template, select_template
+from django.template.loader import get_template
+from django.template.loader import select_template
 
 
 def render_to_string(template_name, context=None, request=None, using=None):

post_office/template/backends/post_office.py

@@ -2,7 +2,9 @@
 from django.core.mail import EmailMultiAlternatives
 from django.template import TemplateDoesNotExist
 from django.template.backends.base import BaseEngine
-from django.template.backends.django import Template as DjangoTemplate, reraise, get_installed_libraries
+from django.template.backends.django import Template as DjangoTemplate
+from django.template.backends.django import get_installed_libraries
+from django.template.backends.django import reraise
 from django.template.engine import Engine
 
 

post_office/templatetags/post_office.py

@@ -1,6 +1,6 @@
-from email.mime.image import MIMEImage
 import hashlib
 import os
+from email.mime.image import MIMEImage
 
 from django import template
 from django.conf import settings

post_office/tests/__init__.py

@@ -1,8 +1,8 @@
 from .test_backends import BackendTest
+from .test_cache import CacheTest
 from .test_commands import CommandTest
 from .test_lockfile import LockTest
 from .test_mail import MailTest
 from .test_models import ModelTest
 from .test_utils import UtilsTest
-from .test_cache import CacheTest
 from .test_views import AdminViewTest

post_office/tests/test_backends.py

@@ -4,12 +4,16 @@
 
 from django.conf import settings
 from django.core.files.images import File
-from django.core.mail import EmailMultiAlternatives, send_mail, EmailMessage
+from django.core.mail import EmailMessage
+from django.core.mail import EmailMultiAlternatives
+from django.core.mail import send_mail
 from django.core.mail.backends.base import BaseEmailBackend
 from django.test import TestCase
 from django.test.utils import override_settings
 
-from ..models import Email, STATUS, PRIORITY
+from ..models import PRIORITY
+from ..models import STATUS
+from ..models import Email
 from ..settings import get_backend
 
 
@@ -20,7 +24,7 @@
     """
 
     def send_messages(self, email_messages):
         raise Exception('Fake Error')
 
 
 class BackendTest(TestCase):

post_office/tests/test_cache.py

@@ -2,6 +2,7 @@
 from django.test import TestCase
 
 from post_office import cache
+
 from ..settings import get_cache_backend
 
 

post_office/tests/test_commands.py

@@ -7,7 +7,9 @@
 from django.test.utils import override_settings
 from django.utils.timezone import now
 
-from ..models import Attachment, Email, STATUS
+from ..models import STATUS
+from ..models import Attachment
+from ..models import Email
 
 
 class CommandTest(TestCase):

post_office/tests/test_connections.py

@@ -1,8 +1,8 @@
 from django.core.mail import backends
 from django.test import TestCase
 
-from .test_backends import ErrorRaisingBackend
 from ..connections import connections
+from .test_backends import ErrorRaisingBackend
 
 
 class ConnectionTest(TestCase):

post_office/tests/test_forms.py

@@ -1,11 +1,11 @@
-from django.forms import formset_factory
-from django.test import TestCase, Client
 from django.contrib.auth import get_user_model
+from django.forms import formset_factory
+from django.test import Client
+from django.test import TestCase
 from django.urls import reverse
 
 from post_office.admin import EmailTemplateAdminForm
 
-
 User = get_user_model()