WIP - Wagtail 4.0.4 upgrade (#1480)

* Django 4.1.7 changes

* last edits for upgrade

* Update requirements

* Removed references to ImageChooserPanel

* Fixed small bug in book index page

* Removed wagtail.core

* Updated postgres version from 10 to 13

.github/workflows/tests.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:10
+        image: postgres:13
         ports:
           - 5432:5432
         options: >-

allies/migrations/0001_initial.py

@@ -4,7 +4,7 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('ally_category', models.CharField(choices=[('OH', 'Online Homework'), ('AC', 'Adaptive Courseware'), ('CT', 'Customized Tools')], max_length=2)),
                 ('heading', models.CharField(max_length=255)),
-                ('description', wagtail.core.fields.RichTextField()),
+                ('description', wagtail.fields.RichTextField()),
                 ('link_url', models.URLField(blank=True, help_text='Call to Action Link')),
                 ('link_text', models.CharField(help_text='Call to Action Text', max_length=255)),
                 ('logo', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')),

allies/migrations/0002_auto_20160222_1359.py

@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='ally',
             name='long_description',
-            field=wagtail.core.fields.RichTextField(default=''),
+            field=wagtail.fields.RichTextField(default=''),
             preserve_default=False,
         ),
     ]

allies/models.py

@@ -1,9 +1,9 @@
 from django.db import models
 from modelcluster.fields import ParentalKey
-from wagtail.admin.edit_handlers import (FieldPanel, InlinePanel,
+from wagtail.admin.panels import (FieldPanel, InlinePanel,
                                                 MultiFieldPanel)
-from wagtail.core.fields import RichTextField
-from wagtail.core.models import Page
+from wagtail.fields import RichTextField
+from wagtail.models import Page
 from wagtail.images.edit_handlers import ImageChooserPanel
 
 from openstax.functions import build_image_url

books/models.py

@@ -11,7 +11,7 @@
 from django.contrib.postgres.fields import ArrayField
 from modelcluster.fields import ParentalKey
 from modelcluster.models import ClusterableModel
-from wagtail.admin.edit_handlers import (FieldPanel,
+from wagtail.admin.panels import (FieldPanel,
                                          InlinePanel,
                                          PageChooserPanel,
                                          StreamFieldPanel)
@@ -22,7 +22,7 @@
 from wagtail.snippets.blocks import SnippetChooserBlock
 from wagtail.images.edit_handlers import ImageChooserPanel
 from wagtail.snippets.edit_handlers import SnippetChooserPanel
-from wagtail.admin.edit_handlers import TabbedInterface, ObjectList
+from wagtail.admin.panels import TabbedInterface, ObjectList
 from wagtail.api import APIField
 from wagtail.snippets.models import register_snippet
 from wagtail.models import Site
@@ -503,7 +503,10 @@ class Book(Page):
         help_text='The book cover to be shown on the website.'
     )
     def get_cover_url(self):
-        return build_document_url(self.cover.url)
+        if self.cover:
+            return build_document_url(self.cover.url)
+        else:
+            return ''
     cover_url = property(get_cover_url)
 
     title_image = models.ForeignKey(

global_settings/__init__.py

@@ -1 +1 @@
-default_app_config = 'global_settings.apps.GlobalSettingsConfig'
+#default_app_config = 'global_settings.apps.GlobalSettingsConfig'

global_settings/apps.py

@@ -1,8 +1,10 @@
 from django.apps import AppConfig
 
+
 class GlobalSettingsConfig(AppConfig):
     name = 'global_settings'
     verbose_name = 'global_settings'
+    default = True
 
     def ready(self):
         import global_settings.signals  # noqa

global_settings/migrations/0009_auto_20170912_1337.py

@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -16,6 +16,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='footer',
             name='copyright',
-            field=wagtail.core.fields.RichTextField(),
+            field=wagtail.fields.RichTextField(),
         ),
     ]

global_settings/models.py

@@ -1,9 +1,9 @@
 from django.db import models
-from wagtail.contrib.settings.models import BaseSetting, register_setting
+from wagtail.contrib.settings.models import BaseSiteSetting, register_setting
 
 
 @register_setting(icon='doc-empty')
-class StickyNote(BaseSetting):
+class StickyNote(BaseSiteSetting):
     start = models.DateTimeField(null=True, help_text="Set the start date to override the content of the Give Sticky. Set the header and body below to change.")
     expires = models.DateTimeField(null=True, help_text="Set the date to expire overriding the content of the Give Sticky.")
     show_popup = models.BooleanField(default=False, help_text="Replaces the top banner with a popup, start and expire dates still control timing.")
@@ -19,7 +19,7 @@ class Meta:
 
 
 @register_setting(icon='collapse-down')
-class Footer(BaseSetting):
+class Footer(BaseSiteSetting):
     supporters = models.TextField()
     copyright = models.TextField()
     ap_statement = models.TextField()
@@ -31,15 +31,15 @@ class Meta:
         verbose_name = 'Footer'
 
 @register_setting(icon='cogs')
-class CloudfrontDistribution(BaseSetting):
+class CloudfrontDistribution(BaseSiteSetting):
     distribution_id = models.CharField(max_length=255, null=True, blank=True)
 
     class Meta:
         verbose_name = 'CloudFront Distribution'
 
 
 @register_setting(icon='date')
-class GiveToday(BaseSetting):
+class GiveToday(BaseSiteSetting):
     give_link_text = models.CharField(max_length=255)
     give_link = models.URLField("Give link", blank=True, help_text="URL to Rice Give page or something similar")
     start = models.DateTimeField(null=True,

global_settings/signals.py

@@ -1,7 +1,7 @@
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 
-from wagtail.core.signals import page_published
+from wagtail.signals import page_published
 
 from .functions import invalidate_cloudfront_caches
 from .models import StickyNote, Footer, GiveToday

global_settings/wagtail_hooks.py

@@ -1,6 +1,6 @@
 import wagtail.admin.rich_text.editors.draftail.features as draftail_features
 from wagtail.admin.rich_text.converters.html_to_contentstate import InlineStyleElementHandler
-from wagtail.core import hooks
+from wagtail import hooks
 from django.urls import reverse
 from wagtail.admin.menu import MenuItem