Fixes errors for ruff v0.1.3

authors/models.py

@@ -1,11 +1,13 @@
+from typing import ClassVar, List
+
 from django.db import models
-from wagtail.api import APIField
+from modelcluster.fields import ParentalKey
 from wagtail.admin.panels import FieldPanel, MultiFieldPanel
+from wagtail.api import APIField
 from wagtail.core.fields import RichTextField
 from wagtail.core.models import Orderable
 from wagtail.images.api.fields import ImageRenditionField
 from wagtail.snippets.models import register_snippet
-from modelcluster.fields import ParentalKey
 
 
 class AuthorsOrderable(Orderable):
@@ -17,7 +19,7 @@ class AuthorsOrderable(Orderable):
         on_delete=models.CASCADE,
     )
 
-    panels = [FieldPanel('author')]
+    panels: ClassVar[List[FieldPanel]] = [FieldPanel('author')]
 
     @property
     def name(self):
@@ -27,7 +29,7 @@ def name(self):
     def image(self):
         return self.author.image
 
-    api_fields = [
+    api_fields: ClassVar[List[APIField]] = [
         APIField('author_id'),
         APIField('name'),
         APIField('image', serializer=ImageRenditionField('fill-100x100')),
@@ -49,11 +51,11 @@ class Author(models.Model):
 
     bio = RichTextField(blank=True, help_text='Brief author bio')
 
-    panels = [
+    panels: ClassVar[List[FieldPanel]] = [
         MultiFieldPanel([FieldPanel('name'), FieldPanel('image'), FieldPanel('bio')])
     ]
 
-    api_fields = [
+    api_fields: ClassVar[List[APIField]] = [
         APIField('id'),
         APIField('name'),
         APIField('image'),

authors/serializers.py

@@ -1,5 +1,8 @@
+from typing import ClassVar, List
+
 from rest_framework.serializers import ModelSerializer, PrimaryKeyRelatedField
 from wagtail.images.api.fields import ImageRenditionField
+
 from authors.models import Author
 
 
@@ -9,7 +12,7 @@ class AuthorSerializer(ModelSerializer):
 
     class Meta:
         model = Author
-        fields = [
+        fields: ClassVar[List[str]] = [
             'author_id',
             'name',
             'image',

authors/views.py

@@ -1,10 +1,13 @@
+from typing import ClassVar, List
+
 from wagtail.api.v2.views import BaseAPIViewSet
+
 from .models import Author
 
 
 class AuthorsAPIViewSet(BaseAPIViewSet):
     model = Author
-    listing_default_fields = [
+    listing_default_fields: ClassVar[List[str]] = [
         'id',
         'detail_url',
         'name',

exhibits/management/commands/rename.py

@@ -25,9 +25,7 @@ def handle(self, old_name, new_name, models, *args, **options):
                 f"UPDATE django_content_type SET app_label='{new_name}' WHERE app_label='{old_name}'"  # noqa E501
             )
             cursor.execute(
-                "UPDATE django_migrations SET app='{}' WHERE app='{}'".format(
-                    new_name, old_name
-                )
+                f"UPDATE django_migrations SET app='{new_name}' WHERE app='{old_name}'"
             )
 
             for model_name in models:

exhibits/models.py

@@ -1,3 +1,5 @@
+from typing import ClassVar, List
+
 from django.db import models
 from modelcluster.fields import ParentalKey
 from pydantic import BaseModel
@@ -21,7 +23,7 @@ class ExhibitsOrderable(Orderable):
         on_delete=models.CASCADE,
     )
 
-    panels = [FieldPanel('exhibit')]
+    panels: ClassVar[List[FieldPanel]] = [FieldPanel('exhibit')]
 
     @property
     def title(self):
@@ -35,7 +37,7 @@ def cover_image(self):
     def authors(self):
         return self.exhibit.authors
 
-    api_fields = [
+    api_fields: ClassVar[List[APIField]] = [
         APIField('exhibit_id'),
         APIField('title'),
         APIField(
@@ -81,9 +83,12 @@ class ExhibitPage(Page):
         related_name='+',
     )
 
-    search_fields = [*Page.search_fields, index.SearchField('body')]
+    search_fields: ClassVar[List[index.SearchField]] = [
+        *Page.search_fields,
+        index.SearchField('body'),
+    ]
 
-    content_panels = [
+    content_panels: ClassVar[List[FieldPanel]] = [
         *Page.content_panels,
         MultiFieldPanel(
             [FieldPanel('cover_image'), FieldPanel('hero_image')], heading='Images'
@@ -93,7 +98,7 @@ class ExhibitPage(Page):
         InlinePanel('other_exhibits', heading='Other Exhibits', max_num=3),
     ]
 
-    api_fields = [
+    api_fields: ClassVar[List[APIField]] = [
         APIField('title'),
         APIField('body', serializer=RichTextSerializer()),
         APIField(

exhibits/views.py

@@ -1,3 +1,5 @@
+from typing import ClassVar, List
+
 from wagtail.api.v2.views import BaseAPIViewSet
 
 from .models import ExhibitPage
@@ -6,7 +8,7 @@
 class ExhibitsAPIViewSet(BaseAPIViewSet):
     model = ExhibitPage
 
-    listing_default_fields = [
+    listing_default_fields: ClassVar[List[str]] = [
         *BaseAPIViewSet.listing_default_fields,
         'title',
         'body',

home/models.py

@@ -1,3 +1,5 @@
+from typing import ClassVar, List
+
 from wagtail.admin.edit_handlers import FieldPanel
 from wagtail.api import APIField
 from wagtail.core.fields import RichTextField
@@ -7,6 +9,9 @@
 class HomePage(Page):
     body = RichTextField(blank=True)
 
-    content_panels = [*Page.content_panels, FieldPanel('body', classname='full')]
+    content_panels: ClassVar[List[FieldPanel]] = [
+        *Page.content_panels,
+        FieldPanel('body', classname='full'),
+    ]
 
-    api_fields = [APIField('body')]
+    api_fields: ClassVar[List[APIField]] = [APIField('body')]

ov_collections/models.py

@@ -1,3 +1,5 @@
+from typing import ClassVar, List
+
 from django.db import models
 from wagtail.admin.edit_handlers import FieldPanel
 from wagtail.api import APIField
@@ -69,16 +71,19 @@ class Collection(Page):
         related_name='+',
     )
 
-    search_fields = [*Page.search_fields, index.SearchField('introduction')]
+    search_fields: ClassVar[List[index.SearchField]] = [
+        *Page.search_fields,
+        index.SearchField('introduction'),
+    ]
 
-    content_panels = [
+    content_panels: ClassVar[List[FieldPanel]] = [
         *Page.content_panels,
         FieldPanel('introduction'),
         FieldPanel('cover_image'),
         FieldPanel('content'),
     ]
 
-    api_fields = [
+    api_fields: ClassVar[List[APIField]] = [
         APIField('title'),
         APIField('introduction'),
         APIField(

ov_collections/views.py

@@ -1,3 +1,5 @@
+from typing import ClassVar, List
+
 from wagtail.api.v2.views import BaseAPIViewSet
 
 from .models import Collection
@@ -6,7 +8,7 @@
 class CollectionAPIViewSet(BaseAPIViewSet):
     model = Collection
 
-    listing_default_fields = [
+    listing_default_fields: ClassVar[List[str]] = [
         *BaseAPIViewSet.listing_default_fields,
         'title',
         'introduction',

pyproject.toml

@@ -2,6 +2,7 @@
 [project]
 # PEP 621 project metadata
 # See https://www.python.org/dev/peps/pep-0621/
+name = "ov-wag"
 dependencies = ["Django<4.2,>=4.1.1", "wagtail<4.1,>=4.0.4", "wagtail-factories<3.2,>=3.1.0", "pydantic<2.0,>=1.10.2", "psycopg2<2.10,>=2.9.3"]
 requires-python = ">=3.8"
 
@@ -37,4 +38,8 @@ select = [
     'UP', # pyupgrade
     'W', # pycodestyle warnings
 
-]
+]
+[tool.pdm.dev-dependencies]
+dev = [
+    "ruff>=0.1.3",
+]