Pinning more dependencies

Author: ArneTR

bakerydemo/base/management/commands/reset_demo.py

@@ -17,7 +17,7 @@ def handle(self, **options):
             )
 
         # 1. (optional) Remove all objects from S3
-        if "s3" in settings.DEFAULT_FILE_STORAGE:
+        if "s3" in default_storage.__class__.__name__.lower():
             self.stdout.write("Removing files from S3")
             default_storage.bucket.objects.all().delete()
         else:

bakerydemo/base/models.py

@@ -12,6 +12,7 @@
     PublishingPanel,
 )
 from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField
+from wagtail.contrib.forms.panels import FormSubmissionsPanel
 from wagtail.contrib.settings.models import (
     BaseGenericSetting,
     BaseSiteSetting,
@@ -463,6 +464,7 @@ class FormPage(AbstractEmailForm):
     # Note how we include the FormField object via an InlinePanel using the
     # related_name value
     content_panels = AbstractEmailForm.content_panels + [
+        FormSubmissionsPanel(),
         FieldPanel("image"),
         FieldPanel("body"),
         InlinePanel("form_fields", heading="Form fields", label="Field"),

bakerydemo/base/templatetags/navigation_tags.py

@@ -4,7 +4,7 @@
 from bakerydemo.base.models import FooterText
 
 register = template.Library()
-# https://docs.djangoproject.com/en/3.2/howto/custom-template-tags/
+# https://docs.djangoproject.com/en/stable/howto/custom-template-tags/
 
 
 @register.simple_tag(takes_context=True)

bakerydemo/settings/base.py

@@ -4,10 +4,10 @@
 Generated by 'django-admin startproject' using Django 1.10.5.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/3.2/topics/settings/
+https://docs.djangoproject.com/en/stable/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/3.2/ref/settings/
+https://docs.djangoproject.com/en/stable/ref/settings/
 """
 
 import os
@@ -19,7 +19,7 @@
 BASE_DIR = os.path.dirname(PROJECT_DIR)
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/stable/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = "c6u0-9c!7nilj_ysatsda0(f@e_2mws2f!6m0n^o*4#*q#kzp)"
@@ -118,7 +118,7 @@
 
 
 # Database
-# https://docs.djangoproject.com/en/3.2/ref/settings/#databases
+# https://docs.djangoproject.com/en/stable/ref/settings/#databases
 
 if "DATABASE_URL" in os.environ:
     DATABASES = {"default": dj_database_url.config(conn_max_age=500)}
@@ -132,7 +132,7 @@
 
 
 # Password validation
-# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/stable/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -151,21 +151,19 @@
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/3.2/topics/i18n/
+# https://docs.djangoproject.com/en/stable/topics/i18n/
 
 LANGUAGE_CODE = "en-us"
 
 TIME_ZONE = "UTC"
 
 USE_I18N = True
 
-USE_L10N = True
-
 USE_TZ = True
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/3.2/howto/static-files/
+# https://docs.djangoproject.com/en/stable/howto/static-files/
 
 STATICFILES_FINDERS = [
     "django.contrib.staticfiles.finders.FileSystemFinder",
@@ -182,6 +180,21 @@
 MEDIA_ROOT = os.path.join(PROJECT_DIR, "media")
 MEDIA_URL = "/media/"
 
+# Default storage settings, with the staticfiles storage updated.
+# See https://docs.djangoproject.com/en/stable/ref/settings/#std-setting-STORAGES
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    # ManifestStaticFilesStorage is recommended in production, to prevent
+    # outdated JavaScript / CSS assets being served from cache
+    # (e.g. after a Wagtail upgrade).
+    # See https://docs.djangoproject.com/en/stable/ref/contrib/staticfiles/#manifeststaticfilesstorage
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage",
+    },
+}
+
 # Override in local settings or replace with your own key. Please don't use our demo key in production!
 GOOGLE_MAP_API_KEY = "AIzaSyD31CT9P9KxvNUJOwDq2kcFEIG8ADgaFgw"
 

bakerydemo/settings/production.py

@@ -24,7 +24,7 @@
 
 # Accept all hostnames, since we don't know in advance which hostname will be used for any given Heroku instance.
 # IMPORTANT: Set this to a real hostname when using this in production!
-# See https://docs.djangoproject.com/en/3.2/ref/settings/#allowed-hosts
+# See https://docs.djangoproject.com/en/stable/ref/settings/#allowed-hosts
 ALLOWED_HOSTS = os.getenv("DJANGO_ALLOWED_HOSTS", "*").split(",")
 
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
@@ -141,13 +141,15 @@
 # https://warehouse.python.org/project/whitenoise/
 
 MIDDLEWARE.append("whitenoise.middleware.WhiteNoiseMiddleware")
-STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
+STORAGES["staticfiles"][
+    "BACKEND"
+] = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 
 if "AWS_STORAGE_BUCKET_NAME" in os.environ:
     AWS_STORAGE_BUCKET_NAME = os.getenv("AWS_STORAGE_BUCKET_NAME")
     AWS_QUERYSTRING_AUTH = False
     INSTALLED_APPS.append("storages")
-    DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+    STORAGES["default"]["BACKEND"] = "storages.backends.s3boto3.S3Boto3Storage"
     AWS_S3_FILE_OVERWRITE = False
     AWS_DEFAULT_ACL = "private"
     if "AWS_S3_CUSTOM_DOMAIN" in os.environ:
@@ -162,7 +164,7 @@
     GS_AUTO_CREATE_BUCKET = True
 
     INSTALLED_APPS.append("storages")
-    DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
+    STORAGES["default"]["BACKEND"] = "storages.backends.gcloud.GoogleCloudStorage"
 
 LOGGING = {
     "version": 1,
@@ -186,7 +188,7 @@
 # These settings are usually used only on the production sites.
 # This is a configuration of the CDN/front-end cache that is used to cache the
 # production websites.
-# https://docs.wagtail.org/en/latest/reference/contrib/frontendcache.html
+# https://docs.wagtail.org/en/stable/reference/contrib/frontendcache.html
 # The backend can be configured to use an account-wide API key, or an API token with
 # restricted access.
 if (
@@ -271,7 +273,7 @@
 # because the apps are running on client domains (or our own for staging), that are
 # being used for other applications as well. We should therefore not impose any
 # restrictions on these unrelated applications.
-# https://docs.djangoproject.com/en/3.2/ref/settings/#secure-hsts-include-subdomains
+# https://docs.djangoproject.com/en/stable/ref/settings/#secure-hsts-include-subdomains
 SECURE_HSTS_INCLUDE_SUBDOMAINS = False
 
 # https://docs.djangoproject.com/en/stable/ref/settings/#secure-browser-xss-filter
@@ -288,5 +290,5 @@
 ).strip()
 
 # Allow the redirect importer to work in load-balanced / cloud environments.
-# https://docs.wagtail.io/en/v2.13/reference/settings.html#redirects
+# https://docs.wagtail.org/en/stable/reference/settings.html#redirects
 WAGTAIL_REDIRECTS_FILE_STORAGE = "cache"

bakerydemo/templates/base/form_page.html

@@ -24,7 +24,7 @@ <h1 class="index-header__title">{{ page.title }}</h1>
             <div class="col-md-8 form-page">
                 {% comment %}
         You could render your form using a Django rendering shortcut such as `{{ form.as_p }}` but that will tend towards unsemantic code, and make it difficult to style. You can read more on Django form at:
-        https://docs.djangoproject.com/en/3.2/topics/forms/#form-rendering-options
+        https://docs.djangoproject.com/en/stable/topics/forms/#working-with-form-templates
         {% endcomment %}
                 <form action="{% pageurl page %}" method="POST">
                     {% csrf_token %}

bakerydemo/wsgi.py

@@ -4,7 +4,7 @@
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/stable/howto/deployment/wsgi/
 """
 
 import os

readme.md

@@ -121,7 +121,7 @@ docker compose logs -f
 
 ## Setup with Virtualenv
 
-You can run the Wagtail demo locally without setting up Vagrant or Docker and simply use Virtualenv, which is the [recommended installation approach](https://docs.djangoproject.com/en/5.1/topics/install/#install-the-django-code) for Django itself.
+You can run the Wagtail demo locally without setting up Vagrant or Docker and simply use Virtualenv, which is the [recommended installation approach](https://docs.djangoproject.com/en/stable/topics/install/#install-the-django-code) for Django itself.
 
 #### Dependencies
 
@@ -217,7 +217,7 @@ In production on your own site, you'll need to change this to:
 
 `EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'`
 
-and configure [SMTP settings](https://docs.djangoproject.com/en/3.2/topics/email/#smtp-backend) appropriate for your email provider.
+and configure [SMTP settings](https://docs.djangoproject.com/en/stable/topics/email/#smtp-backend) appropriate for your email provider.
 
 ### Testing Content-Security-Policy compliance in Wagtail
 
@@ -229,24 +229,12 @@ By default, `django-csp` is not enabled since Wagtail isn't fully compatible yet
 
 The `main` branch of this demo is designed to work with both the latest stable release and the latest `main` branch (development version) of Wagtail. To run the demo against a specific version of Wagtail, we have created [git tags](https://github.com/wagtail/bakerydemo/tags) for the latest commits that work with each feature release.
 
+- [`v6.3`](https://github.com/wagtail/bakerydemo/releases/tag/v6.3)
 - [`v6.2`](https://github.com/wagtail/bakerydemo/releases/tag/v6.2)
 - [`v6.1`](https://github.com/wagtail/bakerydemo/releases/tag/v6.1)
 - [`v6.0`](https://github.com/wagtail/bakerydemo/releases/tag/v6.0)
-- [`v5.2`](https://github.com/wagtail/bakerydemo/releases/tag/v5.2)
 
-<details>
-
-<summary>Older tags</summary>
-
-- [`v5.1`](https://github.com/wagtail/bakerydemo/releases/tag/v5.1)
-- [`v5.0`](https://github.com/wagtail/bakerydemo/releases/tag/v5.0)
-- [`v4.2`](https://github.com/wagtail/bakerydemo/releases/tag/v4.2)
-- [`v4.1`](https://github.com/wagtail/bakerydemo/releases/tag/v4.1)
-- [`v4.0`](https://github.com/wagtail/bakerydemo/releases/tag/v4.0)
-- [`v3.0`](https://github.com/wagtail/bakerydemo/releases/tag/v3.0)
-- [`v2.16`](https://github.com/wagtail/bakerydemo/releases/tag/v2.16)
-
-</details>
+See the [complete tags list](https://github.com/wagtail/bakerydemo/tags) for older releases.
 
 The tags point to the last commit just before the requirements were updated to the next Wagtail version. For example, the `v4.2` tag points to the commit just before the bakerydemo was updated to use Wagtail 5.0. This ensures that the tagged demo code contains the latest updates possible for the supported version.
 

requirements/base.txt

@@ -1,6 +1,5 @@
 Django==5.1.6
 django-dotenv==1.4.2
-wagtail==6.4.0
 wagtail-font-awesome-svg>=1,<2
 django-debug-toolbar>=4.2,<5
 django-extensions==3.2.3

requirements/production.txt

@@ -1,14 +1,13 @@
 -r base.txt
 elasticsearch==5.5.3
 # Additional dependencies for Heroku, AWS, and Google Cloud deployment
-uwsgi>=2.0.17,<2.1
-psycopg[binary]>=3.1,<3.2
+uwsgi==2.0.17
+psycopg[binary]==3.1.0
 whitenoise==6.6.0
-boto3==1.9.189
+boto3==1.37.0
 google-cloud-storage==2.13.0
 django-storages==1.14.2
 # For retrieving credentials and signing requests to Elasticsearch
-botocore>=1.12.33,<1.13
 aws-requests-auth==0.4.3
 django-redis==5.4.0
-django-basic-auth-ip-whitelist==0.6
+django-basic-auth-ip-whitelist==0.7.0