Upgrade django and wagtail versions

Pipfile

@@ -15,8 +15,8 @@ django-silk = "*"
 [packages]
 factory-boy = "==2.11.0"
 wagtail_factories = "==2.0.0"
-django = "<3"
+django = "==3.2"
-whitenoise = "==4.0b4"
+whitenoise = "~=5.3"
 psycopg2 = "==2.8.6"
 gunicorn = "==19.7.1"
 python-dotenv = "==0.13.0"
@@ -24,11 +24,11 @@ dj-database-url = "==0.4.1"
 raven = "==6.9.0"
 django-extensions = "==1.9.8"
 graphene-django = "==2.15.0"
-django-filter = "==2.0.0"
+django-filter = "~=21.1"
-djangorestframework = "==3.8.2"
+djangorestframework = "~=3.8"
 pillow = "==5.0.0"
-wagtail = "==2.5"
+wagtail = "~=2.15"
-django-cors-headers = "==2.2.0"
+django-cors-headers = "~=3.0"
 django-storages = "*"
 boto3 = "*"
 django-compressor = "*"
@@ -42,8 +42,6 @@ ipython = "*"
 requests = "*"
 unittest-xml-reporting = "*"
 django-silk = "*"
-# todo: @django3-update
+wagtail-autocomplete = "*"
-# wagtail-autocomplete = "*"
-wagtail-autocomplete = "==0.6.3"
 jedi = "==0.17.2"
 Authlib = "*"

Pipfile.django3.bk

@@ -1,47 +0,0 @@
-[[source]]
-url = "https://pypi.python.org/simple"
-verify_ssl = true
-name = "pypi"
-
-[requires]
-python_version = "3.8"
-
-[dev-packages]
-awscli = "*"
-ipdb = "*"
-coverage = "*"
-django-silk = "*"
-
-[packages]
-factory-boy = "==2.11.0"
-wagtail_factories = "==2.0.0"
-django = "==3.2"
-whitenoise = "~=5.3"
-psycopg2 = "==2.8.6"
-gunicorn = "==19.7.1"
-python-dotenv = "==0.13.0"
-dj-database-url = "==0.4.1"
-raven = "==6.9.0"
-django-extensions = "==1.9.8"
-graphene-django = "==2.15.0"
-django-filter = "~=21.1"
-djangorestframework = "~=3.8"
-pillow = "==5.0.0"
-wagtail = "~=2.15"
-django-cors-headers = "~=3.0"
-django-storages = "*"
-boto3 = "*"
-django-compressor = "*"
-django-libsass = "*"
-bleach = "*"
-newrelic = "*"
-sentry-sdk = "==0.7.2"
-django-sendgrid-v5 = "==0.8.0"
-python-http-client = "==3.2.1"
-ipython = "*"
-requests = "*"
-unittest-xml-reporting = "*"
-django-silk = "*"
-wagtail-autocomplete = "*"
-jedi = "==0.17.2"
-Authlib = "*"

server/api/graphene_wagtail.py

@@ -18,9 +18,7 @@ logger = logging.getLogger(__name__)
 class GenericStreamFieldType(Scalar):
     @staticmethod
     def serialize(stream_value):
-        # todo: @django3-update
+        raw_data = stream_value.raw_data
-        #raw_data = stream_value.raw_data
-        raw_data = stream_value.stream_data
         return list(augment_fields(raw_data))
 
 

server/books/models/contentblock.py

@@ -106,9 +106,7 @@ class ContentBlock(StrictHierarchyPage):
                )
 
     def save(self, *args, **kwargs):
-        # todo: @django3-update
+        for data in self.contents.raw_data:
-        #for data in self.contents.raw_data:
-        for data in self.contents.stream_data:
             block_type, value = get_type_and_value(data)
 
             if block_type == 'survey':

server/books/schema/nodes/content.py

@@ -55,11 +55,10 @@ class ContentBlockNode(DjangoObjectType, HiddenAndVisibleForMixin):
     def resolve_mine(parent, info, **kwargs):
         return parent.owner is not None and parent.owner.pk == info.context.user.pk
 
-    def resolve_contents(self, info, **kwargs):
+    @staticmethod
+    def resolve_contents(self: ContentBlock, info, **kwargs):
         updated_raw_data = []
-        # todo: @django3-update
+        for content in self.contents.raw_data:
-        #for content in self.contents.raw_data:
-        for content in self.contents.stream_data:
             # only show solutions to teachers and students for whom their teachers have them enabled
             if is_solution_and_hidden_for_user(content['type'], info.context.user, self.module):
                 logger.debug('Solution is hidden for this user')
@@ -72,9 +71,7 @@ class ContentBlockNode(DjangoObjectType, HiddenAndVisibleForMixin):
             content = process_module_room_slug_block(content)
             updated_raw_data.append(content)
 
-        # todo: @django3-update
+        self.contents.raw_data = updated_raw_data
-        #self.contents.raw_data = updated_raw_data
-        self.contents.stream_data = updated_raw_data
         return self.contents
 
     def resolve_bookmarks(self, info, **kwargs):

server/core/factories.py

@@ -7,9 +7,7 @@ from django.conf import settings
 from django.contrib.auth import get_user_model
 from factory.django import ImageField, FileField
 from faker import Faker
-# todo: @django3-update
+from wagtail.documents import get_document_model
-#from wagtail.documents import get_document_model
-from wagtail.documents.models import get_document_model
 from wagtail.images import get_image_model
 
 from users.models import Role, UserRole

server/rooms/wagtail_hooks.py

@@ -28,11 +28,8 @@ def do_after_page_edit(request, page):
 
 
 def get_room_blocks(page):
-    # todo: @django3-update
+    top_level_module_room_slug_blocks = get_block_from_raw_data(page.contents.raw_data, 'module_room_slug')
-    #top_level_module_room_slug_blocks = get_block_from_raw_data(page.contents.raw_data, 'module_room_slug')
+    content_list_module_room_slug_blocks = get_admin_slugs_from_content_list(page.contents.raw_data)
-    #content_list_module_room_slug_blocks = get_admin_slugs_from_content_list(page.contents.raw_data)
-    top_level_module_room_slug_blocks = get_block_from_raw_data(page.contents.stream_data, 'module_room_slug')
-    content_list_module_room_slug_blocks = get_admin_slugs_from_content_list(page.contents.stream_data)
     return top_level_module_room_slug_blocks + content_list_module_room_slug_blocks
 
 

server/surveys/admin.py

@@ -2,9 +2,7 @@ import json
 import logging
 
 from django.contrib import admin
-# todo: @django3-update
+from django.db.models import JSONField
-#from django.db.models import JSONField
-from django.contrib.postgres.fields import JSONField
 from django.forms import widgets
 from django.utils.html import format_html
 from graphql_relay import to_global_id

server/surveys/models.py

@@ -1,8 +1,6 @@
 from django.contrib.auth import get_user_model
 from django.db import models
-# todo: @django3-update
+from django.db.models import JSONField
-# from django.db.models import JSONField
-from django.contrib.postgres.fields import JSONField
 from wagtail.snippets.models import register_snippet