Merge branch 'master' into bumpversion

.github/workflows/release.yml

@@ -23,12 +23,12 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install -U pip
-          python -m pip install -U setuptools twine wheel
+          python -m pip install -U setuptools build twine
 
       - name: Build package
         run: |
-          python setup.py --version
-          python setup.py sdist --format=gztar bdist_wheel
+          python -m build --version
+          python -m build
           twine check dist/*
 
       - name: Upload packages to Jazzband

.gitignore

@@ -7,6 +7,7 @@ example/settings_private.py
 /.tox/
 /htmlcov/
 /docs/_build/
+/dist/
 .eggs/
 
 .idea/

CHANGELOG.md

@@ -4,6 +4,12 @@
 ### Changed
 - Allow django-phonenumber-field 8.x.x.
 
+### Added
+- Support confirmation for Django 5.1.
+
+### Removed
+- Dropped support for Django <4.2.
+
 ## 1.16.0
 ### Fixed
 - Avoid potentially empty `<ul>` on the profile page.

CONTRIBUTING.rst

@@ -63,11 +63,13 @@ The following actions are required to push a new version:
 
     make tx-pull
 
-* Package and upload::
+* Trigger the packaging and upload::
 
+    git tag <tag number>
     git push && git push --tags
-    python setup.py sdist bdist_wheel
-    twine upload dist/*
+
+The `.github/workflows/release.yml` file should do the remaining work and
+publish the release to PyPi.
 
 .. _issue tracker: https://github.com/jazzband/django-two-factor-auth/issues
 .. _source code: https://github.com/jazzband/django-two-factor-auth

README.rst

@@ -37,8 +37,8 @@ providing Django sessions with a foreign key to the user. Although the package
 is optional, it improves account security control over
 ``django.contrib.sessions``.
 
-Compatible with supported Django and Python versions. At the moment of writing that
-includes 3.2, 4.0, 4.1, and 4.2 on Python 3.8, 3.9, 3.10 and 3.11.
+Compatible with supported Django and Python versions. At the moment of writing
+that includes 4.2, 5.0, and 5.1 on Python 3.8 to 3.12.
 Documentation is available at `readthedocs.io`_.
 
 

docs/requirements.rst

@@ -3,8 +3,8 @@ Requirements
 
 Django
 ------
-Supported Django versions are supported. Currently this list includes Django 3.2, 4.0,
-4.1, 4.2 and 5.0.
+Supported Django versions are supported. Currently this list includes Django 4.2,
+5.0 and 5.1.
 
 Python
 ------

example/locale/cs/LC_MESSAGES/django.po

@@ -6,13 +6,14 @@
 # Translators:
 # Adam Tran, 2023
 # Jonas Vacek, 2022
+# Pavel Mises, 2024
 msgid ""
 msgstr ""
 "Project-Id-Version: django-two-factor-auth\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-05-15 22:55+0200\n"
 "PO-Revision-Date: 2013-11-20 09:31+0000\n"
-"Last-Translator: Adam Tran, 2023\n"
+"Last-Translator: Pavel Mises, 2024\n"
 "Language-Team: Czech (http://app.transifex.com/Bouke/django-two-factor-auth/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +45,7 @@ msgstr "Tajná stránka"
 
 #: templates/_base.html:39
 msgid "Account Security"
-msgstr "Bezpečnost Účtu"
+msgstr "Bezpečnost účtu"
 
 #: templates/_base.html:41
 msgid "Sessions"
@@ -64,7 +65,7 @@ msgstr "Přihlásit"
 
 #: templates/home.html:4
 msgid "django-two-factor-auth – Demo Application"
-msgstr "django-two-factor-auth – Demo Aplikace"
+msgstr "django-two-factor-auth – demo aplikace"
 
 #: templates/home.html:8
 msgid "Improve Your Security <small>your users will thank you</small>"
@@ -86,7 +87,7 @@ msgid ""
 "<code>settings_private.py</code> file? By doing so, the example app will be "
 "able to call and text you to verify your authentication tokens. Otherwise, "
 "the tokens will be shown on the screen."
-msgstr "Vlořili jste vaše Twilio údaje do souboru <code>settings_private.py</code>? S němi vám bude moc vzorová aplikace zavolat a posílat SMS zprávy k ověřování vašich tokenů. Jinak vám tokeny budou zobrazeny na obrazovce."
+msgstr "Vložili jste své Twilio údaje do souboru <code>settings_private.py</code>? S nimi vám bude moct vzorová aplikace zavolat a posílat SMS zprávy k ověřování vašich tokenů. Jinak vám tokeny budou zobrazeny na obrazovce."
 
 #: templates/home.html:26
 msgid "Next steps:"
@@ -100,27 +101,27 @@ msgstr "Začněte <a href=\"%(reg_url)s\">registrací</a> účtu."
 #: templates/home.html:30
 #, python-format
 msgid "<a href=\"%(login_url)s\">Login</a> to your account."
-msgstr "<a href=\"%(login_url)s\">Přihlašte se</a> do vašeho účtu."
+msgstr "<a href=\"%(login_url)s\">Přihlašte se</a> do svého účtu."
 
 #: templates/home.html:32
 #, python-format
 msgid "<a href=\"%(setup_url)s\">Enable</a> two-factor authentication."
-msgstr "<a href=\"%(setup_url)s\">Zapnout</a> dvoufázové ovšření"
+msgstr "<a href=\"%(setup_url)s\">Zapnout</a> dvoufázové ověření"
 
 #: templates/home.html:34
 #, python-format
 msgid ""
 "Then, <a href=\"%(logout_url)s\">logout</a> and <a "
 "href=\"%(login_url)s\">login</a> once more to your account to see two-factor"
 " authentication at work."
-msgstr "Potom se opět <a href=\"%(logout_url)s\">odhlašte</a> a <a href=\"%(login_url)s\">přihlašte</a> do vašeho účtu, abyste viděli dvoufázové ověření v praxi."
+msgstr "Potom se opět <a href=\"%(logout_url)s\">odhlaste</a> a <a href=\"%(login_url)s\">přihlaste</a> do vašeho účtu, abyste viděli dvoufázové ověření v praxi."
 
 #: templates/home.html:37
 #, python-format
 msgid ""
 "At last, you've gained access to the <a href=\"%(secret_url)s\">secret "
 "page</a>! :-)"
-msgstr "Konečně, byl vám umožněn přístup k <a href=\"%(secret_url)s\">tajné stránce</a>! :-)"
+msgstr "Konečně vám byl umožněn přístup k <a href=\"%(secret_url)s\">tajné stránce</a>! :-)"
 
 #: templates/registration.html:5
 msgid "Registration"
@@ -150,4 +151,4 @@ msgstr "Blahopřejeme, váš účet byl úspěšně zaregistrován."
 msgid ""
 "Congratulations, you've made it. You have successfully enabled two-factor "
 "authentication and logged in with your token."
-msgstr "Blahopřejeme, zvládli jste to. Úspěšně jste zapnulu dvoufázové ověření, a přihlísili jste se se svým tokenem."
+msgstr "Blahopřejeme, zvládli jste to. Úspěšně jste zapnuli dvoufázové ověření, a přihlásili jste se se svým tokenem."

pyproject.toml

@@ -17,7 +17,7 @@ maintainers = [
 license = {text = "MIT"}
 requires-python = ">= 3.8"
 dependencies = [
-    "Django>=3.2",
+    "Django>=4.2",
     "django_otp>=0.8.0",
     "qrcode>=4.0.0,<7.99",
     "django-phonenumber-field<9",
@@ -28,11 +28,9 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Web Environment",
     "Framework :: Django",
-    "Framework :: Django :: 3.2",
-    "Framework :: Django :: 4.0",
-    "Framework :: Django :: 4.1",
     "Framework :: Django :: 4.2",
     "Framework :: Django :: 5.0",
+    "Framework :: Django :: 5.1",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",

tox.ini

@@ -1,8 +1,7 @@
 [tox]
 envlist =
-    py{38,39,310}-dj32-{normal,yubikey,custom_user,webauthn}
-    py{38,39,310,311}-dj{40,41,42}-{normal,yubikey,custom_user,webauthn}
-    py{310,311,312}-dj{50,main}-{normal,yubikey,custom_user,webauthn}
+    py{38,39,310,311,312}-dj42-{normal,yubikey,custom_user,webauthn}
+    py{310,311,312}-dj{50,51,main}-{normal,yubikey,custom_user,webauthn}
 
 [gh-actions]
 python =
@@ -14,11 +13,9 @@ python =
 
 [gh-actions:env]
 DJANGO =
-    3.2: dj32
-    4.0: dj40
-    4.1: dj41
     4.2: dj42
     5.0: dj50
+    5.1: dj51
     main: djmain
 VARIANT =
     normal: normal
@@ -41,11 +38,9 @@ basepython =
     py311: python3.11
     py312: python3.12
 deps =
-    dj32: Django<4.0
-    dj40: Django<4.1
-    dj41: Django<4.2
     dj42: Django<5.0
     dj50: Django<5.1
+    dj51: Django<5.2
     djmain: https://github.com/django/django/archive/main.tar.gz
     webauthn: -rrequirements_e2e.txt
 extras =

two_factor/__init__.py

@@ -1,4 +1 @@
-import django
 
-if django.VERSION <= (3, 2):
-    default_app_config = 'two_factor.apps.TwoFactorConfig'