dj4 (#389)

Author: domdinicola

.gitignore

@@ -31,6 +31,7 @@ ghostdriver.log
 .python-version
 .ruby-version
 .settings/
+.idea/
 
 ## generic files to ignore
 *~

.travis.yml

@@ -4,37 +4,33 @@ dist: bionic
 matrix:
   fast_finish: true
   include:
-    # Python 3.5
-    - python: 3.5
-      env: TOXENV=py35-django22
-
-    # Python 3.6
-    - python: 3.6
-      env: TOXENV=py36-django22,py36-django30
-
     # Python 3.7
     - python: 3.7
-      env: TOXENV=py37-django22,py37-django30,py37-preventxss
+      env: TOXENV=py37-django22,py37-django31,py37-django32,py37-django40
 
     # Python 3.8
     - python: 3.8
-      env: TOXENV=py38-django22,py38-django30
+      env: TOXENV=py38-django22,py38-django31,py38-django32,py38-django40
+
+    # Python 3.9
+    - python: 3.9
+      env: TOXENV=py39-django22,py39-django31,py39-django32,py39-django40
 
     # Django Master
-    - python: 3.6
-      env: TOXENV=py36-djangomaster
     - python: 3.7
       env: TOXENV=py37-djangomaster
     - python: 3.8
       env: TOXENV=py38-djangomaster
+    - python: 3.9
+      env: TOXENV=py39-djangomaster
 
   allow_failures:
-    - python: 3.6
-      env: TOXENV=py36-djangomaster
     - python: 3.7
       env: TOXENV=py37-djangomaster
     - python: 3.8
       env: TOXENV=py38-djangomaster
+    - python: 3.9
+      env: TOXENV=py39-djangomaster
 
 # before_install:
   # Workaround for a permissions issue with Travis virtual machine images

post_office/admin.py

@@ -4,14 +4,13 @@
 from django.db import models
 from django.contrib import admin
 from django.conf import settings
-from django.conf.urls import re_path
 from django.core.exceptions import ValidationError
 from django.core.mail.message import SafeMIMEText
 from django.forms import BaseInlineFormSet
 from django.forms.widgets import TextInput
 from django.http.response import HttpResponse, HttpResponseNotFound
 from django.template import Context, Template
-from django.urls import reverse
+from django.urls import re_path, reverse
 from django.utils.html import format_html
 from django.utils.text import Truncator
 from django.utils.translation import gettext_lazy as _

post_office/test_settings.py

@@ -79,6 +79,7 @@
                 'django.template.context_processors.debug',
                 'django.template.context_processors.i18n',
                 'django.template.context_processors.media',
+                'django.template.context_processors.request',
                 'django.template.context_processors.static',
                 'django.template.context_processors.tz',
                 'django.contrib.messages.context_processors.messages',
@@ -103,3 +104,6 @@
 ]
 
 STATICFILES_DIRS = [os.path.join(BASE_DIR, 'tests/static')]
+
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+

post_office/test_urls.py

@@ -1,6 +1,6 @@
-from django.conf.urls import url
 from django.contrib import admin
+from django.urls import re_path
 
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
+    re_path(r'^admin/', admin.site.urls),
 ]

post_office/utils.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.files import File
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 from post_office import cache
 from .models import Email, PRIORITY, STATUS, EmailTemplate, Attachment
@@ -16,7 +16,7 @@ def send_mail(subject, message, from_email, recipient_list, html_message='',
     ``send_mail`` core email method.
     """
 
-    subject = force_text(subject)
+    subject = force_str(subject)
     status = None if priority == PRIORITY.now else STATUS.queued
     emails = [
         Email.objects.create(

setup.py

@@ -47,7 +47,7 @@ def run_tests(self):
     zip_safe=False,
     include_package_data=True,
     package_data={'': ['README.rst']},
-    install_requires=['django>=2.2', 'jsonfield>=3.0'],
+    install_requires=['django>=2.2', 'jsonfield>=3.0', 'bleach', 'pytz'],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
@@ -58,10 +58,9 @@ def run_tests(self):
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Topic :: Communications :: Email',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Software Development :: Libraries :: Python Modules',

tox.ini

@@ -1,10 +1,10 @@
 [tox]
 envlist =
-  py{35,36,37}-django22
-  py{36,37,38}-django30
-  py{36,37,38}-django31
-  py{36,37,38}-preventxss
-  py{36,37,38}-djangomain
+  py{37,38,39}-django22
+  py{37,38,39}-django31
+  py{37,38,39}-django32
+  py{37,38,39}-django40
+  py{38,39}-djangomain
 
 [testenv]
 setenv =
@@ -13,16 +13,15 @@ setenv =
 
 deps =
   django22: Django<3
-  django30: Django<3.1
   django31: Django<3.2
-  preventxss: Django
-  preventxss: bleach
+  django32: Django<4.0
+  django40: Django<4.1
   djangomain: https://github.com/django/django/archive/main.tar.gz
 
 whitelist_externals = which
 
 commands =
   which python
   python -V
-  which django-admin.py
-  django-admin.py test post_office ./
+  pip freeze | grep Django
+  django-admin test post_office ./