Upgrade to Wagtail-4.2

ccnmtl · Apr 28, 2023 · 8570ccc · 8570ccc
1 parent 8c7c8db
commit 8570ccc
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 26 deletions.
diff --git a/portfolio/featured/wagtail_hooks.py b/portfolio/featured/wagtail_hooks.py
@@ -1,5 +1,5 @@
 from django.urls import path, reverse
-from wagtail.core import hooks
+from wagtail import hooks
 from wagtail.admin.menu import MenuItem
 
 from portfolio.featured.views import FeaturedView

diff --git a/portfolio/main/management/commands/bootstrap_site_tree.py b/portfolio/main/management/commands/bootstrap_site_tree.py
@@ -3,7 +3,7 @@
 from django.core.management.base import (
     BaseCommand, CommandError
 )
-from wagtail.core.models import Page, Site
+from wagtail.models import Page, Site
 from wagtail.images.models import Image
 from wagtail.images.tests.utils import get_test_image_file
 

diff --git a/portfolio/main/migrations/0001_initial.py b/portfolio/main/migrations/0001_initial.py
@@ -5,7 +5,7 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
             name='Entry',
             fields=[
                 ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
-                ('body', wagtail.core.fields.RichTextField(blank=True)),
+                ('body', wagtail.fields.RichTextField(blank=True)),
             ],
             options={
                 'abstract': False,

diff --git a/portfolio/main/migrations/0009_auto_20180111_1329.py b/portfolio/main/migrations/0009_auto_20180111_1329.py
@@ -6,7 +6,7 @@
 from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='entry',
             name='body',
-            field=wagtail.core.fields.RichTextField(blank=True, help_text='The main content of this Portfolio entry page'),
+            field=wagtail.fields.RichTextField(blank=True, help_text='The main content of this Portfolio entry page'),
         ),
         migrations.AlterField(
             model_name='entry',

diff --git a/portfolio/main/migrations/0018_homepage.py b/portfolio/main/migrations/0018_homepage.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):
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
             name='HomePage',
             fields=[
                 ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
-                ('body', wagtail.core.fields.RichTextField(blank=True)),
+                ('body', wagtail.fields.RichTextField(blank=True)),
             ],
             options={
                 'abstract': False,

diff --git a/portfolio/main/migrations/0019_visualindex.py b/portfolio/main/migrations/0019_visualindex.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):
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
             name='VisualIndex',
             fields=[
                 ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
-                ('intro', wagtail.core.fields.RichTextField(blank=True)),
+                ('intro', wagtail.fields.RichTextField(blank=True)),
             ],
             options={
                 'abstract': False,

diff --git a/portfolio/main/migrations/0020_textualindex.py b/portfolio/main/migrations/0020_textualindex.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):
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
             name='TextualIndex',
             fields=[
                 ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
-                ('intro', wagtail.core.fields.RichTextField(blank=True)),
+                ('intro', wagtail.fields.RichTextField(blank=True)),
             ],
             options={
                 'abstract': False,

diff --git a/portfolio/main/migrations/0025_staticpage.py b/portfolio/main/migrations/0025_staticpage.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):
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
             name='StaticPage',
             fields=[
                 ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
-                ('body', wagtail.core.fields.RichTextField(blank=True)),
+                ('body', wagtail.fields.RichTextField(blank=True)),
             ],
             options={
                 'abstract': False,

diff --git a/portfolio/main/migrations/0026_auto_20210827_1159.py b/portfolio/main/migrations/0026_auto_20210827_1159.py
@@ -4,7 +4,7 @@
 import django.db.models.deletion
 import django.utils.timezone
 import modelcluster.fields
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -89,7 +89,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='entry',
             name='description',
-            field=wagtail.core.fields.RichTextField(blank=True, help_text='The main content of this Portfolio entry page.'),
+            field=wagtail.fields.RichTextField(blank=True, help_text='The main content of this Portfolio entry page.'),
         ),
         migrations.AlterField(
             model_name='entry',

diff --git a/portfolio/main/migrations/0032_auto_20211214_1432.py b/portfolio/main/migrations/0032_auto_20211214_1432.py
@@ -3,7 +3,7 @@
 from django.db import migrations, models
 import django.db.models.deletion
 import modelcluster.fields
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='entry',
             name='description',
-            field=wagtail.core.fields.RichTextField(blank=True, help_text='The main descriptive text of this Portfolio entry page.'),
+            field=wagtail.fields.RichTextField(blank=True, help_text='The main descriptive text of this Portfolio entry page.'),
         ),
         migrations.AlterField(
             model_name='entry',

diff --git a/portfolio/main/models.py b/portfolio/main/models.py
@@ -10,10 +10,10 @@
 from django.utils.html import escape
 from django_extensions.db.models import TimeStampedModel
 from modelcluster.fields import ParentalManyToManyField, ParentalKey
-from wagtail.admin.edit_handlers import FieldPanel, MultiFieldPanel
-from wagtail.admin.edit_handlers import InlinePanel
-from wagtail.core.fields import RichTextField
-from wagtail.core.models import Page, Orderable
+from wagtail.admin.panels import FieldPanel, MultiFieldPanel
+from wagtail.admin.panels import InlinePanel
+from wagtail.fields import RichTextField
+from wagtail.models import Page, Orderable
 from wagtail.documents.edit_handlers import DocumentChooserPanel
 from wagtail.images.edit_handlers import ImageChooserPanel
 from wagtail.snippets.edit_handlers import SnippetChooserPanel

diff --git a/portfolio/main/wagtail_hooks.py b/portfolio/main/wagtail_hooks.py
@@ -1,5 +1,5 @@
 from django.utils.html import format_html
-from wagtail.core import hooks
+from wagtail import hooks
 
 
 @hooks.register('insert_editor_js')

diff --git a/portfolio/settings_shared.py b/portfolio/settings_shared.py
@@ -35,7 +35,7 @@
     'wagtail.images',
     'wagtail.search',
     'wagtail.admin',
-    'wagtail.core',
+    'wagtail',
     'modelcluster',
     'taggit',
     'django.contrib.sitemaps',

diff --git a/portfolio/urls.py b/portfolio/urls.py
@@ -7,7 +7,7 @@
 from django.views.static import serve
 from django_cas_ng import views as cas_views
 from wagtail.admin import urls as wagtailadmin_urls
-from wagtail.core import urls as wagtail_urls
+from wagtail import urls as wagtail_urls
 from wagtail.documents import urls as wagtaildocs_urls
 
 from portfolio.main.views import S3DocumentServe

diff --git a/requirements.txt b/requirements.txt
@@ -78,7 +78,7 @@ django-storages==1.13
 Unidecode==1.3.2
 
 # wagtail requirements
-wagtail==3.0.3
+wagtail==4.2.2
 django-modelcluster>=6.0,<7.0
 django-permissionedforms>=0.1,<1.0
 django-taggit>=2.0,<4.0
@@ -95,6 +95,7 @@ xlsxwriter>=1.2.8,<4.0
 tablib[xls,xlsx]>=0.14.0
 anyascii>=0.1.5
 telepath>=0.1.1,<1
+openpyxl>=3.0.10,<4.0
 
 # wagtail additions
 wagtailfontawesome==1.2.1