Update Python, Django, and Wagtail version support

* Add Python 3.13 * Add Django 5.2 * Add Wagtail 6.3, 7.0 & 7.1 * Drop Wegtail <6.3 * Drop Django 5.1

Author: codingjoe

.github/workflows/ci.yml

@@ -64,10 +64,11 @@ jobs:
  - "3.10"
  - "3.11"
  - "3.12"
+ - "3.13"
  django-version:
- - "4.2"
- - "5.0"
- - "5.1"
+ - "4.2.0"
+ - "5.1.0"
+ - "5.2.0"
  steps:
  - uses: actions/checkout@v5
  - uses: actions/setup-python@v6
@@ -88,8 +89,9 @@ jobs:
  matrix:
  python-version: [ "3.x" ]
  wagtail-version:
- - "5.2.0"
- - "6.0.0"
+ - "6.3.0"
+ - "7.0.0"
+ - "7.1.0"
  steps:
  - uses: actions/checkout@v5
  - name: Set up Python ${{ matrix.python-version }}
@@ -141,31 +143,3 @@ jobs:
  with:
  token: ${{ secrets.CODECOV_TOKEN }}
  flags: ${{ matrix.extras }}
-
- analyze:
- name: CodeQL
- needs: [ SQLite, wagtail, PostgreSQL ]
- runs-on: ubuntu-latest
- permissions:
- actions: read
- contents: read
- security-events: write
- strategy:
- fail-fast: false
- matrix:
- language: [ python ]
- steps:
- - name: Checkout
- uses: actions/checkout@v5
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v3
- with:
- languages: ${{ matrix.language }}
- queries: +security-and-quality
- - name: Autobuild
- uses: github/codeql-action/autobuild@v3
- if: ${{ matrix.language == 'javascript' || matrix.language == 'python' }}
- - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v3
- with:
- category: "/language:${{ matrix.language }}"

mailauth/contrib/wagtail/templates/wagtailadmin/login.html

@@ -1,83 +1,18 @@
-{% extends "wagtailadmin/admin_base.html" %}
+{% extends "wagtailadmin/login.html" %}
 {% load wagtailadmin_tags i18n %}
 {% block titletag %}{% trans "Sign in" %}{% endblock %}
 {% block bodyclass %}login{% endblock %}
 
-{% block extra_css %}
- {{ block.super }}
+{% block fields %}
+ {% formattedfield form.username %}
 
- <link rel="stylesheet" href="{% versioned_static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
-{% endblock %}
-
-{% block furniture %}
- <main class="content-wrapper" role="main">
- {% if messages or form.errors %}
- <div class="messages">
- <ul>
- {% if form.errors %}
- <li class="error">{{ form.errors.email.0 }}</li>
- {% endif %}
- {% for message in messages %}
- <li class="{{ message.tags }}">{{ message }}</li>
- {% endfor %}
- </ul>
- </div>
- {% endif %}
-
- {% block above_login %}{% endblock %}
-
- <form action="{% url 'wagtailadmin_login' %}" method="post" autocomplete="off" novalidate>
- {% block login_form %}
- {% csrf_token %}
-
- {% url 'wagtailadmin_home' as home_url %}
- <input type="hidden" name="next" value="{{ next|default:home_url }}" />
-
- <h1>{% block branding_login %}{% trans "Sign in to Wagtail" %}{% endblock %}</h1>
-
- <ul class="fields">
- {% block fields %}
- <li class="full">
- <div class="field iconfield">
- {{ form.email.label_tag }}
- <div class="input icon-mail">
- {{ form.email }}
- </div>
- </div>
- </li>
-
- {% block extra_fields %}
- {% for field_name, field in form.extra_fields %}gs
- <li class="full">
- {{ field.label_tag }}
- <div class="field iconfield">
- {{ field }}
- </div>
- </li>
- {% endfor %}
- {% endblock extra_fields %}
-
- {% comment %}
- Removed until functionality exists
- <li class="checkbox">
- <div class="field">
- <label><input type="checkbox" />{% trans "Remember me" %}</label>
- </div>
- </li>
- {% endcomment %}
- {% endblock %}
- <li class="submit">
- {% block submit_buttons %}
- <button type="submit" class="button button-longrunning" data-clicked-text="{% trans 'Signing in…' %}"><span class="icon icon-spinner"></span><em>{% trans 'Sign in' %}</em></button>
- {% endblock %}
- </li>
- </ul>
- {% endblock %}
- </form>
-
- {% block below_login %}{% endblock %}
+ {% block extra_fields %}
+ {% for field_name, field in form.extra_fields %}
+ {% formattedfield field %}
+ {% endfor %}
+ {% endblock extra_fields %}
 
- </main>
+ {% include "wagtailadmin/shared/forms/single_checkbox.html" with label_classname="remember-me" name="remember" text=_("Remember me") %}
 {% endblock %}
 
 {% block extra_js %}

pyproject.toml

@@ -27,14 +27,15 @@ classifiers = [
  "Programming Language :: Python :: 3.10",
  "Programming Language :: Python :: 3.11",
  "Programming Language :: Python :: 3.12",
+ "Programming Language :: Python :: 3.13",
  "Programming Language :: Python :: 3 :: Only",
  "Framework :: Django",
  "Framework :: Django :: 4.2",
- "Framework :: Django :: 5.0",
  "Framework :: Django :: 5.1",
+ "Framework :: Django :: 5.2",
  "Framework :: Wagtail",
- "Framework :: Wagtail :: 5",
  "Framework :: Wagtail :: 6",
+ "Framework :: Wagtail :: 7",
  "Topic :: Internet",
  "Topic :: Internet :: WWW/HTTP",
  "Topic :: Software Development :: Quality Assurance",
@@ -60,7 +61,7 @@ docs = [
  "sphinx",
 ]
 wagtail = [
- "wagtail>=2.8",
+ "wagtail>=6.3",
 ]
 postgres = [
  "django-citext",