feat: Support Django 4.0

Closes #97
cdriehuys · Dec 29, 2021 · 1ad8a53 · 1ad8a53
1 parent 6e28c9c
commit 1ad8a53
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 14 deletions.
diff --git a/.github/workflows/review-build.yml b/.github/workflows/review-build.yml
@@ -17,15 +17,36 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        django-version:
-          - '>= 2.2, < 2.3'
-          - '>= 3.0, < 3.1'
-          - '>= 3.1, < 3.2'
-        python-version:
-          - "3.6"
-          - "3.7"
-          - "3.8"
-          - "3.9"
+        include:
+          # Django 2.2
+          - django-version: '>= 2.2, < 2.3'
+            python-version: "3.6"
+          - django-version: '>= 2.2, < 2.3'
+            python-version: "3.7"
+          - django-version: '>= 2.2, < 2.3'
+            python-version: "3.8"
+          - django-version: '>= 2.2, < 2.3'
+            python-version: "3.9"
+
+          # Django 3.2
+          - django-version: '>= 3.2, < 3.3'
+            python-version: "3.6"
+          - django-version: '>= 3.2, < 3.3'
+            python-version: "3.7"
+          - django-version: '>= 3.2, < 3.3'
+            python-version: "3.8"
+          - django-version: '>= 3.2, < 3.3'
+            python-version: "3.9"
+          - django-version: '>= 3.2, < 3.3'
+            python-version: "3.10"
+
+          # Django 4.0
+          - django-version: '>= 4.0, < 4.1'
+            python-version: "3.8"
+          - django-version: '>= 4.0, < 4.1'
+            python-version: "3.9"
+          - django-version: '>= 4.0, < 4.1'
+            python-version: "3.10"
 
     steps:
       - uses: actions/checkout@v2

diff --git a/README.rst b/README.rst
@@ -38,7 +38,7 @@ Compatibility
 *************
 
 | **Python:** 3.6 or later
-| **Django:** Versions 2.2 through 3.1
+| **Django:** Versions 2.2 through 4.0
 | **Django REST Framework:** 3.10 or later
 
 ***************

diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -6,6 +6,8 @@ In Development
 
 Features
   * :issue:`96`: Ability to customize email subjects.
+  * :issue:`97`: Added support for Django 4. We explicitly test against Django
+    2.2, 3.2, and 4.0, but all versions after 2.2 should work.
 
 v3.0.3
 ------

diff --git a/rest_email_auth/app_settings.py b/rest_email_auth/app_settings.py
@@ -7,7 +7,7 @@
 
 import sys
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppSettings(object):

diff --git a/setup.py b/setup.py
@@ -22,8 +22,8 @@ def get_description():
         # Supported versions of Django
         "Framework :: Django",
         "Framework :: Django :: 2.2",
-        "Framework :: Django :: 3.0",
-        "Framework :: Django :: 3.1",
+        "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4.0",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Natural Language :: English",
@@ -38,7 +38,7 @@ def get_description():
     packages=find_packages(),
     # Dependencies
     install_requires=[
-        "Django >= 2.2, < 3.2",
+        "Django >= 2.2, <= 4.0",
         "django-email-utils >= 1.0, < 2.0",
         # DRF 3.10 is the first to support our minimum Django version of 2.2.
         "djangorestframework >= 3.10",