Changes to build with leading edge Wagtail/Python

Author: angloc

Dockerfile

@@ -1,9 +1,9 @@
 # Docker configuration for backend development. Not created for production use.
 # It does not include front-end .
 # Main production build is done using Dockerfile in the root of the project
-FROM breneser/mssql-python-nodejs
+FROM python:3.10-bullseye
 
 WORKDIR /code
 ADD requirements.txt /code/
-RUN pip install --upgrade pip && pip install -r requirements.txt
+RUN python -V && pip install --upgrade pip && pip install -r requirements.txt
 ADD . /code

config/settings/base.py

@@ -18,6 +18,7 @@
 PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 BASE_DIR = os.path.dirname(PROJECT_DIR)
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
@@ -72,7 +73,6 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
-    'wagtail.core.middleware.SiteMiddleware',
     'wagtail.contrib.redirects.middleware.RedirectMiddleware',
 ]
 

requirements.txt

@@ -1,14 +1,17 @@
-Django>=3.1,<3.2
-wagtail>=2.10,<2.11
+Django~=4.0
+wagtail~=2.16
 psycopg2>=2.8,<2.9
 python-crontab>=2.5,<2.6
 django-cors-headers>=3.5,<3.6
-django-storages>=1.10,<1.11
-azure>=4,<5
+django-storages[azure]~=1.12
+azure-storage-common~=2.1
+azure-storage-file~=2.1
+azure-storage-blob~=12.9
+azure-core~=1.23
 coverage>=5.2,<5.3
 gunicorn>=20.0,<20.1
 flake8>=3.8,<3.9
-django-debug-toolbar>=2.2,<2.3
+django-debug-toolbar~=3.2
 factory-boy>=3.0,<3.1
-django_extensions>=3.0,<3.1
+django_extensions~=3.1
 safety

urls.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.conf import settings
-from django.conf.urls import include, url
+from django.conf.urls import include
 from django.urls import include, path, re_path
 from django.contrib import admin
 from django.http import HttpResponse
@@ -17,11 +17,11 @@
 
 
 urlpatterns = [
-    url(r'^django-admin/', admin.site.urls),
-    url(r'^admin/', include(wagtailadmin_urls)),
-    url(r'^documents/', include(wagtaildocs_urls)),
-    url(r'^api/v2/', api_router.urls),
-    url(r'', include(wagtail_urls)),
+    re_path(r'^django-admin/', admin.site.urls),
+    re_path(r'^admin/', include(wagtailadmin_urls)),
+    re_path(r'^documents/', include(wagtaildocs_urls)),
+    re_path(r'^api/v2/', api_router.urls),
+    re_path(r'', include(wagtail_urls)),
 ]
 
 if settings.DEBUG:
@@ -35,5 +35,5 @@
 
     # Django debug toolbar
     urlpatterns = [
-                      url(r'^__debug__/', include(debug_toolbar.urls)),
+                      re_path(r'^__debug__/', include(debug_toolbar.urls)),
                   ] + urlpatterns

wagtailreacttaxonomy/models.py

@@ -6,7 +6,7 @@
 from azure.common import AzureMissingResourceHttpError
 from azure.storage.file.models import File as AzureFile, Directory as AzureDirectory
 
-from azure.storage.blob import BlockBlobService
+from azure.storage.blob import BlobServiceClient
 
 from django.db import models
 from django.db.models.signals import pre_save
@@ -30,7 +30,7 @@ def update_taxonomy_terms_on_blobstore(sender, instance, **kwargs):
         content['terms'] = terms_with_vocab
 
         blobPath = f'taxonomy/{instance.taxonomy_id}.json'
-        blob_service = BlockBlobService(account_name=settings.AZURE_ACCOUNT_NAME, account_key=settings.AZURE_ACCOUNT_KEY)
+        blob_service = BlobServiceClient(account_name=settings.AZURE_ACCOUNT_NAME, account_key=settings.AZURE_ACCOUNT_KEY)
         blob_service.create_blob_from_text(settings.AZURE_CONTAINER, blobPath, to_json(content))
         logger.info('Successfully wrote taxonomy json to BlobStore %s', blobPath)