Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit bacc7ac

Browse files
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
1 parent 884b627 commit bacc7ac

File tree

3 files changed

+20
-110
lines changed

3 files changed

+20
-110
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,11 @@ jobs:
6464
- "3.10"
6565
- "3.11"
6666
- "3.12"
67+
- "3.13"
6768
django-version:
68-
- "4.2"
69-
- "5.0"
70-
- "5.1"
69+
- "4.2.0"
70+
- "5.1.0"
71+
- "5.2.0"
7172
steps:
7273
- uses: actions/checkout@v5
7374
- uses: actions/setup-python@v6
@@ -88,8 +89,9 @@ jobs:
8889
matrix:
8990
python-version: [ "3.x" ]
9091
wagtail-version:
91-
- "5.2.0"
92-
- "6.0.0"
92+
- "6.3.0"
93+
- "7.0.0"
94+
- "7.1.0"
9395
steps:
9496
- uses: actions/checkout@v5
9597
- name: Set up Python ${{ matrix.python-version }}
@@ -141,31 +143,3 @@ jobs:
141143
with:
142144
token: ${{ secrets.CODECOV_TOKEN }}
143145
flags: ${{ matrix.extras }}
144-
145-
analyze:
146-
name: CodeQL
147-
needs: [ SQLite, wagtail, PostgreSQL ]
148-
runs-on: ubuntu-latest
149-
permissions:
150-
actions: read
151-
contents: read
152-
security-events: write
153-
strategy:
154-
fail-fast: false
155-
matrix:
156-
language: [ python ]
157-
steps:
158-
- name: Checkout
159-
uses: actions/checkout@v5
160-
- name: Initialize CodeQL
161-
uses: github/codeql-action/init@v3
162-
with:
163-
languages: ${{ matrix.language }}
164-
queries: +security-and-quality
165-
- name: Autobuild
166-
uses: github/codeql-action/autobuild@v3
167-
if: ${{ matrix.language == 'javascript' || matrix.language == 'python' }}
168-
- name: Perform CodeQL Analysis
169-
uses: github/codeql-action/analyze@v3
170-
with:
171-
category: "/language:${{ matrix.language }}"

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

Lines changed: 9 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,18 @@
1-
{% extends "wagtailadmin/admin_base.html" %}
1+
{% extends "wagtailadmin/login.html" %}
22
{% load wagtailadmin_tags i18n %}
33
{% block titletag %}{% trans "Sign in" %}{% endblock %}
44
{% block bodyclass %}login{% endblock %}
55

6-
{% block extra_css %}
7-
{{ block.super }}
6+
{% block fields %}
7+
{% formattedfield form.username %}
88

9-
<link rel="stylesheet" href="{% versioned_static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
10-
{% endblock %}
11-
12-
{% block furniture %}
13-
<main class="content-wrapper" role="main">
14-
{% if messages or form.errors %}
15-
<div class="messages">
16-
<ul>
17-
{% if form.errors %}
18-
<li class="error">{{ form.errors.email.0 }}</li>
19-
{% endif %}
20-
{% for message in messages %}
21-
<li class="{{ message.tags }}">{{ message }}</li>
22-
{% endfor %}
23-
</ul>
24-
</div>
25-
{% endif %}
26-
27-
{% block above_login %}{% endblock %}
28-
29-
<form action="{% url 'wagtailadmin_login' %}" method="post" autocomplete="off" novalidate>
30-
{% block login_form %}
31-
{% csrf_token %}
32-
33-
{% url 'wagtailadmin_home' as home_url %}
34-
<input type="hidden" name="next" value="{{ next|default:home_url }}" />
35-
36-
<h1>{% block branding_login %}{% trans "Sign in to Wagtail" %}{% endblock %}</h1>
37-
38-
<ul class="fields">
39-
{% block fields %}
40-
<li class="full">
41-
<div class="field iconfield">
42-
{{ form.email.label_tag }}
43-
<div class="input icon-mail">
44-
{{ form.email }}
45-
</div>
46-
</div>
47-
</li>
48-
49-
{% block extra_fields %}
50-
{% for field_name, field in form.extra_fields %}gs
51-
<li class="full">
52-
{{ field.label_tag }}
53-
<div class="field iconfield">
54-
{{ field }}
55-
</div>
56-
</li>
57-
{% endfor %}
58-
{% endblock extra_fields %}
59-
60-
{% comment %}
61-
Removed until functionality exists
62-
<li class="checkbox">
63-
<div class="field">
64-
<label><input type="checkbox" />{% trans "Remember me" %}</label>
65-
</div>
66-
</li>
67-
{% endcomment %}
68-
{% endblock %}
69-
<li class="submit">
70-
{% block submit_buttons %}
71-
<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>
72-
{% endblock %}
73-
</li>
74-
</ul>
75-
{% endblock %}
76-
</form>
77-
78-
{% block below_login %}{% endblock %}
9+
{% block extra_fields %}
10+
{% for field_name, field in form.extra_fields %}
11+
{% formattedfield field %}
12+
{% endfor %}
13+
{% endblock extra_fields %}
7914

80-
</main>
15+
{% include "wagtailadmin/shared/forms/single_checkbox.html" with label_classname="remember-me" name="remember" text=_("Remember me") %}
8116
{% endblock %}
8217

8318
{% block extra_js %}

‎pyproject.toml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@ classifiers = [
2727
"Programming Language :: Python :: 3.10",
2828
"Programming Language :: Python :: 3.11",
2929
"Programming Language :: Python :: 3.12",
30+
"Programming Language :: Python :: 3.13",
3031
"Programming Language :: Python :: 3 :: Only",
3132
"Framework :: Django",
3233
"Framework :: Django :: 4.2",
33-
"Framework :: Django :: 5.0",
3434
"Framework :: Django :: 5.1",
35+
"Framework :: Django :: 5.2",
3536
"Framework :: Wagtail",
36-
"Framework :: Wagtail :: 5",
3737
"Framework :: Wagtail :: 6",
38+
"Framework :: Wagtail :: 7",
3839
"Topic :: Internet",
3940
"Topic :: Internet :: WWW/HTTP",
4041
"Topic :: Software Development :: Quality Assurance",
@@ -60,7 +61,7 @@ docs = [
6061
"sphinx",
6162
]
6263
wagtail = [
63-
"wagtail>=2.8",
64+
"wagtail>=6.3",
6465
]
6566
postgres = [
6667
"django-citext",

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /