Lint

.github/report_nightly_build_failure.py

@@ -4,16 +4,18 @@
 This reports an error to the #nightly-build-failures Slack channel.
 """
 import os
+
 import requests
 
+
 if "SLACK_WEBHOOK_URL" in os.environ:
     # https://docs.github.com/en/free-pro-team@latest/actions/reference/environment-variables#default-environment-variables
     repository = os.environ["GITHUB_REPOSITORY"]
     run_id = os.environ["GITHUB_RUN_ID"]
     url = f"https://github.com/{repository}/actions/runs/{run_id}"
 
     print("Reporting to #nightly-build-failures slack channel")
-    response = requests.post(
+    response = requests.post(  # noqa: S113
         os.environ["SLACK_WEBHOOK_URL"],
         json={
             "text": f"A Nightly build failed. See {url}",

pyproject.toml

@@ -101,7 +101,8 @@ ignore = ["E501"]
 
 [tool.ruff.isort]
 known-first-party = ["src"]
-
+lines-between-types = 1
+lines-after-imports = 2
 
 [tool.coverage.run]
 branch = true

src/wagtailmedia/api/serializers.py

@@ -1,9 +1,8 @@
-from wagtail.api.v2.serializers import BaseSerializer
-from wagtail.api.v2.utils import get_full_url
-
 import rest_framework.fields
 
 from rest_framework.fields import ReadOnlyField
+from wagtail.api.v2.serializers import BaseSerializer
+from wagtail.api.v2.utils import get_full_url
 
 
 class MediaDownloadUrlField(ReadOnlyField):

src/wagtailmedia/blocks.py

@@ -3,7 +3,6 @@
 from django.forms import ModelChoiceField
 from django.template.loader import render_to_string
 from django.utils.functional import cached_property
-
 from wagtail.admin.compare import BlockComparison
 from wagtail.blocks import ChooserBlock
 

src/wagtailmedia/edit_handlers.py

@@ -3,7 +3,6 @@
 from typing import TYPE_CHECKING
 
 from django.template.loader import render_to_string
-
 from wagtail.admin.compare import ForeignObjectComparison
 from wagtail.admin.panels import FieldPanel
 
@@ -19,8 +18,8 @@
 class MediaChooserPanel(FieldPanel):
     object_type_name = "media"
 
-    def __init__(self, field_name, media_type=None, *args, **kwargs):
-        super().__init__(field_name=field_name, *args, **kwargs)
+    def __init__(self, field_name, *args, media_type=None, **kwargs):
+        super().__init__(field_name, *args, **kwargs)
 
         self.media_type = media_type
 

src/wagtailmedia/forms.py

@@ -2,7 +2,6 @@
 from django.forms.models import modelform_factory
 from django.utils.module_loading import import_string
 from django.utils.translation import gettext_lazy as _
-
 from wagtail.admin import widgets
 from wagtail.admin.forms.collections import (
     BaseCollectionMemberForm,

src/wagtailmedia/migrations/0001_initial.py

@@ -1,12 +1,11 @@
 # Generated by Django 1.9.5 on 2016-04-20 12:32
 
-from django.conf import settings
-from django.db import migrations, models
 import django.db.models.deletion
 import taggit.managers
 
+from django.conf import settings
+from django.db import migrations, models
 from wagtail import models as wagtail_models
-
 from wagtail.search import index
 
 

src/wagtailmedia/migrations/0004_duration_optional_floatfield.py

@@ -1,6 +1,7 @@
 # Generated by Django 2.2.8 on 2020-08-17 15:30
 
 import django.core.validators
+
 from django.db import migrations, models
 
 

src/wagtailmedia/models.py

@@ -8,13 +8,11 @@
 from django.dispatch import Signal
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-
+from taggit.managers import TaggableManager
 from wagtail.models import CollectionMember, ReferenceIndex
 from wagtail.search import index
 from wagtail.search.queryset import SearchableQuerySetMixin
 
-from taggit.managers import TaggableManager
-
 from wagtailmedia.settings import wagtailmedia_settings
 
 
@@ -170,10 +168,10 @@ def get_media_model():
         app_label, model_name = wagtailmedia_settings.MEDIA_MODEL.split(".")
     except AttributeError:
         return Media
-    except ValueError:
+    except ValueError as err:
         raise ImproperlyConfigured(
             "WAGTAILMEDIA[\"MEDIA_MODEL\"] must be of the form 'app_label.model_name'"
-        )
+        ) from err
 
     media_model = apps.get_model(app_label, model_name)
     if media_model is None:

src/wagtailmedia/views/chooser.py

@@ -1,7 +1,6 @@
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-
 from wagtail import hooks
 from wagtail.admin.auth import PermissionPolicyChecker
 from wagtail.admin.forms.search import SearchForm

src/wagtailmedia/views/media.py

@@ -4,7 +4,6 @@
 from django.utils.text import capfirst
 from django.utils.translation import gettext as _
 from django.views.decorators.vary import vary_on_headers
-
 from wagtail.admin import messages
 from wagtail.admin.admin_url_finder import AdminURLFinder
 from wagtail.admin.auth import PermissionPolicyChecker, permission_denied

src/wagtailmedia/wagtail_hooks.py

@@ -2,7 +2,6 @@
 from django.utils.html import format_html
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
-
 from wagtail import hooks
 from wagtail.admin.admin_url_finder import (
     ModelAdminURLFinder,

src/wagtailmedia/widgets.py

@@ -4,7 +4,6 @@
 from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
-
 from wagtail.admin.staticfiles import versioned_static
 from wagtail.admin.widgets import BaseChooser, BaseChooserAdapter
 from wagtail.telepath import register

tests/test_admin.py

@@ -1,9 +1,7 @@
 from django.test import TestCase
 from django.urls import reverse
-
 from wagtail.models import Page
 from wagtail.test.utils import WagtailTestUtils
-
 from wagtailmedia.blocks import AbstractMediaChooserBlock
 
 

tests/test_api.py

@@ -2,7 +2,6 @@
 
 from django.test import TestCase, override_settings
 from django.urls import reverse
-
 from wagtailmedia.models import get_media_model
 
 from .utils import create_audio, create_video

tests/test_blocks.py

@@ -1,7 +1,6 @@
 from django.core.files.base import ContentFile
 from django.test import TestCase
 from django.urls import reverse
-
 from wagtailmedia.blocks import (
     AbstractMediaChooserBlock,
     AudioChooserBlock,

tests/test_compare.py

@@ -1,7 +1,5 @@
 from django.test import TestCase
 from django.utils.safestring import SafeString
-
-from tests.testapp.models import BlogStreamPage
 from wagtailmedia.blocks import (
     AudioChooserBlock,
     MediaChooserBlockComparison,
@@ -11,6 +9,8 @@
 from wagtailmedia.models import get_media_model
 from wagtailmedia.utils import format_audio_html, format_video_html
 
+from tests.testapp.models import BlogStreamPage
+
 from .utils import create_audio, create_video
 
 

tests/test_edit_handlers.py

@@ -1,14 +1,13 @@
 from django.contrib.auth.models import AnonymousUser
 from django.test import RequestFactory, TestCase
 from django.urls import reverse
-
 from wagtail.admin.panels import FieldPanel, ObjectList
 from wagtail.models import Page
-
-from tests.testapp.models import BlogStreamPage
 from wagtailmedia.edit_handlers import MediaChooserPanel, MediaFieldComparison
 from wagtailmedia.widgets import AdminAudioChooser, AdminMediaChooser, AdminVideoChooser
 
+from tests.testapp.models import BlogStreamPage
+
 from .utils import create_audio, create_video
 
 

tests/test_form_override.py

@@ -1,12 +1,11 @@
 from django import forms
 from django.test import TestCase, override_settings
-
 from wagtail.admin import widgets
-
-from tests.testapp.forms import AlternateMediaForm, OverridenWidget
 from wagtailmedia import models
 from wagtailmedia.forms import BaseMediaForm, get_media_base_form, get_media_form
 
+from tests.testapp.forms import AlternateMediaForm, OverridenWidget
+
 
 class TestFormOverride(TestCase):
     def test_get_media_base_form(self):

tests/test_models.py

@@ -4,7 +4,6 @@
 from django.db import transaction
 from django.template import Context, Template
 from django.test import TestCase, override_settings
-
 from wagtailmedia.forms import get_media_form
 from wagtailmedia.models import get_media_model
 
@@ -257,7 +256,7 @@ class TestMediaModel(TestCase):
     def test_media_model(self):
         cls = get_media_model()
         self.assertEqual(
-            "{}.{}".format(cls._meta.app_label, cls.__name__),
+            f"{cls._meta.app_label}.{cls.__name__}",
             "wagtailmedia_tests.CustomMedia",
         )
 

tests/test_permissions.py

@@ -3,10 +3,8 @@
 from django.core.files.base import ContentFile
 from django.test import TestCase
 from django.urls import reverse
-
 from wagtail.models import Collection, GroupCollectionPermission
 from wagtail.test.utils import WagtailTestUtils
-
 from wagtailmedia import models
 
 

tests/test_settings.py

@@ -1,7 +1,6 @@
 from unittest import mock
 
 from django.test import TestCase, override_settings
-
 from wagtailmedia.settings import WagtailMediaSettings, wagtailmedia_settings
 
 

tests/test_utils.py

@@ -1,6 +1,5 @@
 from django.core.files.base import ContentFile
 from django.test import TestCase
-
 from wagtailmedia.models import get_media_model
 from wagtailmedia.utils import format_audio_html, format_video_html
 

tests/test_views.py

@@ -8,12 +8,11 @@
 from django.test import TestCase, modify_settings
 from django.test.utils import override_settings
 from django.urls import NoReverseMatch, reverse
-
 from wagtail.models import Collection, GroupCollectionPermission
 from wagtail.test.utils import WagtailTestUtils
+from wagtailmedia import models
 
 from tests.testapp.models import EventPage, EventPageRelatedMedia
-from wagtailmedia import models
 
 
 class TestMediaIndexView(TestCase, WagtailTestUtils):

tests/test_widgets.py

@@ -1,6 +1,5 @@
 from django.test import TestCase
 from django.urls import reverse
-
 from wagtailmedia import widgets
 from wagtailmedia.widgets import AdminAudioChooser, AdminMediaChooser, AdminVideoChooser
 

tests/testapp/forms.py

@@ -1,5 +1,4 @@
 from django.forms.widgets import Widget
-
 from wagtailmedia.forms import BaseMediaForm
 
 

tests/testapp/migrations/0001_initial.py

@@ -1,18 +1,20 @@
 # Generated by Django 4.1.4 on 2023-02-15 17:47
 
-from django.conf import settings
 import django.core.validators
-from django.db import migrations, models
 import django.db.models.deletion
 import modelcluster.fields
 import taggit.managers
-import tests.testapp.models
 import wagtail.blocks
 import wagtail.fields
 import wagtail.models.collections
 import wagtail.search.index
 import wagtailmedia.blocks
 
+from django.conf import settings
+from django.db import migrations, models
+
+import tests.testapp.models
+
 
 class Migration(migrations.Migration):
     initial = True

tests/testapp/models.py

@@ -1,13 +1,11 @@
 from django.db import models
 from django.forms.utils import flatatt
 from django.utils.html import format_html, format_html_join
-
 from modelcluster.fields import ParentalKey
 from wagtail import blocks
 from wagtail.admin.panels import FieldPanel, InlinePanel
 from wagtail.fields import RichTextField, StreamField
 from wagtail.models import Orderable, Page
-
 from wagtailmedia.blocks import (
     AbstractMediaChooserBlock,
     AudioChooserBlock,

tests/urls.py

@@ -1,12 +1,10 @@
 from django.conf import settings
 from django.urls import include, path
 from django.views.static import serve
-
 from wagtail import urls as wagtail_urls
 from wagtail.admin import urls as wagtailadmin_urls
 from wagtail.api.v2.router import WagtailAPIRouter
 from wagtail.documents import urls as wagtaildocs_urls
-
 from wagtailmedia.api.views import MediaAPIViewSet
 
 

tests/utils.py

@@ -3,7 +3,6 @@
 from typing import Optional
 
 from django.core.files.base import ContentFile
-
 from wagtailmedia.models import MediaType, get_media_model