diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee9f7e7..e30557b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,10 +41,18 @@ jobs: - "3.11" - "3.12" - "3.13" + - "3.14" django-version: - - "4.2.0" - - "5.1.0" - - "5.2.0" + - "4.2" + - "5.2" + - "6.0" + exclude: + - python-version: "3.14" + django-version: "4.2" + - python-version: "3.10" + django-version: "6.0" + - python-version: "3.11" + django-version: "6.0" steps: - uses: actions/checkout@v6 - uses: actions/setup-python@v6 @@ -65,9 +73,10 @@ jobs: matrix: python-version: ["3.x"] wagtail-version: - - "6.3.0" - - "7.0.0" - - "7.1.0" + - "6.3" + - "7.0" + - "7.1" + - "7.2" steps: - uses: actions/checkout@v6 - name: Set up Python ${{ matrix.python-version }} @@ -76,7 +85,7 @@ jobs: python-version: ${{ matrix.python-version }} - run: sudo apt-get update && sudo apt-get install -y gettext - run: python -m pip install -e ".[test,wagtail]" - - run: python -m pip install wagtail~=${{ matrix.wagtail-version }} + - run: python -m pip install wagtail~=${{ matrix.wagtail-version }}.0 - run: python -m pytest - uses: codecov/codecov-action@v5 with: diff --git a/mailauth/contrib/user/models.py b/mailauth/contrib/user/models.py index 61bbc44..b622106 100644 --- a/mailauth/contrib/user/models.py +++ b/mailauth/contrib/user/models.py @@ -105,9 +105,6 @@ def anonymize(self, commit=True): return update_fields -delattr(AbstractEmailUser, "password") - - class EmailUser(AbstractEmailUser): class Meta(AbstractEmailUser.Meta): swappable = "AUTH_USER_MODEL" diff --git a/pyproject.toml b/pyproject.toml index b19decb..cecb461 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,11 +28,12 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Programming Language :: Python :: 3 :: Only", "Framework :: Django", "Framework :: Django :: 4.2", - "Framework :: Django :: 5.1", "Framework :: Django :: 5.2", + "Framework :: Django :: 6.0", "Framework :: Wagtail", "Framework :: Wagtail :: 6", "Framework :: Wagtail :: 7", diff --git a/tests/contrib/auth/test_models.py b/tests/contrib/auth/test_models.py index 31c0c26..90b5d6c 100644 --- a/tests/contrib/auth/test_models.py +++ b/tests/contrib/auth/test_models.py @@ -1,5 +1,4 @@ import pytest -from django.core.exceptions import FieldDoesNotExist from mailauth.contrib.user.models import EmailUser @@ -30,8 +29,7 @@ def test_get_session_auth_hash__unique(self, db): def test_password_field(self): user = EmailUser(email="spiderman@avengers.com") - with pytest.raises(FieldDoesNotExist): - assert user.password + assert user.password is None class TestEmailUserManager: