Merge remote-tracking branch 'upstream/main' into gmt-pinned-versions

* upstream/main:
  Add v5.2, v6.0, and v6.1 tags to README
  Add skip-link (wagtail#504)
  Remove unused dropdown menu code
  More linting
  Linting
  Fix small accessibility and design issues
  link to virtualenv corrected
  Add footertext locale migration and remove spurious workflowcontenttype fixture
  Update Vagrant config to ubuntu/jammy64
  use workspace-python-3.12 image
  Use `actions/checkout@v4`
  Replace `docker-compose` with `docker compose` in CI
  Version bump django-basic-auth-ip-whitelist to 0.6.x
  Drop mentions of Python 3.8/3.9 in docs (Django 5.0 requires 3.10)
  Upgrade Docker, Heroku, CI to Python 3.12
  Bump to Wagtail 6.2, Django 5.0

Author: ArneTR

.github/workflows/docker.yml

@@ -12,12 +12,12 @@ jobs:
   build-container:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build container
-        run: docker-compose build && docker-compose pull
+        run: docker compose build && docker compose pull
       - name: Run migrations
-        run: docker-compose run app /venv/bin/python manage.py migrate
+        run: docker compose run app /venv/bin/python manage.py migrate
       - name: Load initial data
-        run: docker-compose run app /venv/bin/python manage.py load_initial_data
+        run: docker compose run app /venv/bin/python manage.py load_initial_data
       - name: Run tests
-        run: docker-compose run app /venv/bin/python manage.py test
+        run: docker compose run app /venv/bin/python manage.py test

.github/workflows/lint.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: '3.12'
           cache: 'pip'
           cache-dependency-path: 'requirements/*.txt'
       - name: Install dependencies

.gitpod.dockerfile

@@ -1,4 +1,4 @@
-FROM gitpod/workspace-full
+FROM gitpod/workspace-python-3.12
 ENV PYTHONUSERBASE=/workspace/.pip-modules
 ENV PATH=$PYTHONUSERBASE/bin:$PATH
 ENV PIP_USER=yes

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.12-slim
 
 # Install packages needed to run your application (not build deps):
 # We need to recreate the /usr/share/man/man{1..8} directories first because
@@ -34,9 +34,9 @@ RUN set -ex \
         zlib1g-dev \
     " \
     && apt-get update && apt-get install -y --no-install-recommends $BUILD_DEPS \
-    && python3.10 -m venv ${VIRTUAL_ENV} \
-    && pip install -U pip \
-    && pip install --no-cache-dir -r /requirements/production.txt \
+    && python3.12 -m venv ${VIRTUAL_ENV} \
+    && python3.12 -m pip install -U pip \
+    && python3.12 -m pip install --no-cache-dir -r /requirements/production.txt \
     && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $BUILD_DEPS \
     && rm -rf /var/lib/apt/lists/*
 

Vagrantfile

@@ -12,8 +12,8 @@ Vagrant.configure(2) do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "wagtail/buster64"
-  config.vm.box_version = "~> 1.0"
+  config.vm.box = "ubuntu/jammy64"
+  config.vm.box_version = "~> 20220810.0.0"
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs

bakerydemo/base/fixtures/bakerydemo.json

@@ -1516,13 +1516,6 @@
       "workflow": 1
     }
   },
-  {
-    "model": "wagtailcore.workflowcontenttype",
-    "pk": 4,
-    "fields": {
-      "workflow": 1
-    }
-  },
   {
     "model": "wagtailcore.workflowtask",
     "pk": 1,

bakerydemo/base/migrations/0021_alter_footertext_locale.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.0.8 on 2024-08-15 17:22
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("base", "0020_alter_footertext_options"),
+        ("wagtailcore", "0094_alter_page_locale"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="footertext",
+            name="locale",
+            field=models.ForeignKey(
+                editable=False,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="+",
+                to="wagtailcore.locale",
+                verbose_name="locale",
+            ),
+        ),
+    ]

bakerydemo/base/templatetags/navigation_tags.py

@@ -15,13 +15,6 @@ def get_site_root(context):
     return Site.find_for_request(context["request"]).root_page
 
 
-def has_menu_children(page):
-    # This is used by the top_menu property
-    # get_children is a Treebeard API thing
-    # https://tabo.pe/projects/django-treebeard/docs/4.0.1/api.html
-    return page.get_children().live().in_menu().exists()
-
-
 def has_children(page):
     # Generically allow index pages to list their children
     return page.get_children().live().exists()
@@ -33,13 +26,10 @@ def is_active(page, current_page):
 
 
 # Retrieves the top menu items - the immediate children of the parent page
-# The has_menu_children method is necessary because the Foundation menu requires
-# a dropdown class to be applied to a parent
 @register.inclusion_tag("tags/top_menu.html", takes_context=True)
 def top_menu(context, parent, calling_page=None):
     menuitems = parent.get_children().live().in_menu()
     for menuitem in menuitems:
-        menuitem.show_dropdown = has_menu_children(menuitem)
         # We don't directly check if calling_page is None since the template
         # engine can pass an empty string to calling_page
         # if the variable passed as calling_page does not exist.
@@ -56,30 +46,6 @@ def top_menu(context, parent, calling_page=None):
     }
 
 
-# Retrieves the children of the top menu items for the drop downs
-@register.inclusion_tag("tags/top_menu_children.html", takes_context=True)
-def top_menu_children(context, parent, calling_page=None):
-    menuitems_children = parent.get_children()
-    menuitems_children = menuitems_children.live().in_menu()
-    for menuitem in menuitems_children:
-        menuitem.has_dropdown = has_menu_children(menuitem)
-        # We don't directly check if calling_page is None since the template
-        # engine can pass an empty string to calling_page
-        # if the variable passed as calling_page does not exist.
-        menuitem.active = (
-            calling_page.url_path.startswith(menuitem.url_path)
-            if calling_page
-            else False
-        )
-        menuitem.children = menuitem.get_children().live().in_menu()
-    return {
-        "parent": parent,
-        "menuitems_children": menuitems_children,
-        # required by the pageurl tag that we want to use within this template
-        "request": context["request"],
-    }
-
-
 @register.inclusion_tag("tags/breadcrumbs.html", takes_context=True)
 def breadcrumbs(context):
     self = context.get("self")

bakerydemo/static/css/main.css

@@ -252,6 +252,11 @@ figure img {
   height: auto;
 }
 
+/* Overriding Bootstrap's default caption styles */
+caption {
+  color: var(--dark);
+}
+
 /* Generic detail page styles */
 .intro {
   font-family: var(--font--secondary);
@@ -402,10 +407,12 @@ blockquote .attribute-name {
   color: var(--dark);
 }
 
-/* stylelint-disable-next-line selector-class-pattern */
-.block-paragraph_block a {
+/* stylelint-disable selector-class-pattern */
+.block-paragraph_block a,
+.block-ingredients_list a {
   text-decoration: underline;
 }
+/* stylelint-enable selector-class-pattern */
 
 /* stylelint-disable-next-line selector-class-pattern */
 .block-embed_block iframe {
@@ -448,6 +455,18 @@ blockquote .attribute-name {
   z-index: 10;
 }
 
+.skip-link {
+  z-index: 20;
+  position: absolute;
+  top: -100%;
+  padding: 20px;
+  background-color: var(--white);
+}
+
+.skip-link:focus {
+  top: 0;
+}
+
 .index-header__title {
   color: var(--dark);
   font-weight: 400;
@@ -742,38 +761,6 @@ blockquote .attribute-name {
   }
 }
 
-.dropdown-menu {
-  background-color: var(--cream);
-  border-radius: 0;
-  border: transparent;
-}
-
-.dropdown-menu > li > a {
-  border-bottom: 1px solid var(--border-grey);
-  color: var(--dark);
-  font-family: var(--font--secondary);
-  padding: 10px 20px;
-}
-
-.dropdown-menu > li > a:hover {
-  text-decoration: underline;
-}
-
-/* Menu dropdown hack to allow toggling */
-li.has-submenu a.allow-toggle {
-  float: left;
-  padding-right: 0;
-}
-
-.caret-custom {
-  float: right;
-  padding: 10px 10px 15px 5px !important;
-}
-
-.caret-custom::after {
-  content: '▼' !important;
-}
-
 /* Mobile menu styling */
 @media (max-width: 1150px) {
   .nav-pills > .presentation {

bakerydemo/templates/base.html

@@ -41,7 +41,7 @@
         {% endblock breadcrumbs %}
 
 
-        <main>
+        <main id="main-content">
             {% block messages %}
                 {% include "includes/messages.html" %}
             {% endblock messages %}