Skip to content

Commit 4f18bf6

Browse files
committed
Update Python & Django version support
* Add Python 3.14 * Add Django 6.0 * Add Wagtail 7.2 * Drop Django 5.1 (EoL)
1 parent e8d0630 commit 4f18bf6

File tree

4 files changed

+19
-14
lines changed

4 files changed

+19
-14
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,18 @@ jobs:
4141
- "3.11"
4242
- "3.12"
4343
- "3.13"
44+
- "3.14"
4445
django-version:
45-
- "4.2.0"
46-
- "5.1.0"
47-
- "5.2.0"
46+
- "4.2"
47+
- "5.2"
48+
- "6.0"
49+
exclude:
50+
- python-version: "3.14"
51+
django-version: "4.2"
52+
- python-version: "3.10"
53+
django-version: "6.0"
54+
- python-version: "3.11"
55+
django-version: "6.0"
4856
steps:
4957
- uses: actions/checkout@v6
5058
- uses: actions/setup-python@v6
@@ -65,9 +73,10 @@ jobs:
6573
matrix:
6674
python-version: ["3.x"]
6775
wagtail-version:
68-
- "6.3.0"
69-
- "7.0.0"
70-
- "7.1.0"
76+
- "6.3"
77+
- "7.0"
78+
- "7.1"
79+
- "7.2"
7180
steps:
7281
- uses: actions/checkout@v6
7382
- name: Set up Python ${{ matrix.python-version }}
@@ -76,7 +85,7 @@ jobs:
7685
python-version: ${{ matrix.python-version }}
7786
- run: sudo apt-get update && sudo apt-get install -y gettext
7887
- run: python -m pip install -e ".[test,wagtail]"
79-
- run: python -m pip install wagtail~=${{ matrix.wagtail-version }}
88+
- run: python -m pip install wagtail~=${{ matrix.wagtail-version }}.0
8089
- run: python -m pytest
8190
- uses: codecov/codecov-action@v5
8291
with:

mailauth/contrib/user/models.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@ def anonymize(self, commit=True):
105105
return update_fields
106106

107107

108-
delattr(AbstractEmailUser, "password")
109-
110-
111108
class EmailUser(AbstractEmailUser):
112109
class Meta(AbstractEmailUser.Meta):
113110
swappable = "AUTH_USER_MODEL"

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ classifiers = [
2828
"Programming Language :: Python :: 3.11",
2929
"Programming Language :: Python :: 3.12",
3030
"Programming Language :: Python :: 3.13",
31+
"Programming Language :: Python :: 3.14",
3132
"Programming Language :: Python :: 3 :: Only",
3233
"Framework :: Django",
3334
"Framework :: Django :: 4.2",
34-
"Framework :: Django :: 5.1",
3535
"Framework :: Django :: 5.2",
36+
"Framework :: Django :: 6.0",
3637
"Framework :: Wagtail",
3738
"Framework :: Wagtail :: 6",
3839
"Framework :: Wagtail :: 7",

tests/contrib/auth/test_models.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import pytest
2-
from django.core.exceptions import FieldDoesNotExist
32

43
from mailauth.contrib.user.models import EmailUser
54

@@ -30,8 +29,7 @@ def test_get_session_auth_hash__unique(self, db):
3029

3130
def test_password_field(self):
3231
user = EmailUser(email="spiderman@avengers.com")
33-
with pytest.raises(FieldDoesNotExist):
34-
assert user.password
32+
assert user.password is None
3533

3634

3735
class TestEmailUserManager:

0 commit comments

Comments
 (0)