Merge pull request #123 from vintasoftware/feat/update-supported-python-django-versions

Update supported python and django versions

Author: fjsj

.travis.yml

@@ -1,60 +1,18 @@
 language: python
 
-matix:
-  include:
-  - python: 3.6
-    env:
-      - TOX_ENV=py36-flake8
-  - python: 3.4
-    env:
-      - TOX_ENV=py34-django20
-  - python: 3.5
-    env:
-      - TOX_ENV=py35-django20
-  - python: 3.6
-    env:
-      - TOX_ENV=py36-django20
-  - python: 3.7
-    env:
-      - TOX_ENV=py37-django20
-  - python: 3.5
-    env:
-      - TOX_ENV=py35-django21
-  - python: 3.6
-    env:
-      - TOX_ENV=py36-django21
-  - python: 3.7
-    env:
-      - TOX_ENV=py37-django21
-  - python: 3.5
-    env:
-      - TOX_ENV=py35-django22
-  - python: 3.6
-    env:
-      - TOX_ENV=py36-django22
-  - python: 3.7
-    env:
-      - TOX_ENV=py37-django22
-  - python: 3.8
-    env:
-      - TOX_ENV=py38-django22
-  - python: 3.6
-    env:
-      - TOX_ENV=py36-django30
-  - python: 3.7
-    env:
-      - TOX_ENV=py37-django30
-  - python: 3.8
-    env:
-      - TOX_ENV=py38-django30
+python:
+  - "3.6"
+  - "3.7"
+  - "3.8"
+  - "3.9"
 
 install:
-  - pip install tox
+  - pip install tox-travis
   - pip install -r requirements.txt
   - pip install coveralls
 
 script:
-  - tox -e $TOX_ENV
+  - tox
 
 after_script:
   coveralls

README.rst

@@ -24,6 +24,16 @@ develop branch: https://github.com/vintasoftware/django-templated-email/blob/dev
 
 stable pypi/master: https://github.com/vintasoftware/django-templated-email/blob/master/README.rst
 
+
+Requirements
+=================
+* Python (3.6, 3.7, 3.8, 3.9)
+* Django (2.2, 3.1, 3.2)
+
+We **highly recommend** and only officially support the latest patch release of
+each Python and Django series.
+
+
 Getting going - installation
 ==============================
 
@@ -315,6 +325,7 @@ Methods:
 **templated_email_get_recipients(self, form)** (mandatory):
     Return the recipient list to whom the email will be sent to.
     ie:
+
 .. code-block:: python
 
       def templated_email_get_recipients(self, form):
@@ -324,6 +335,7 @@ Methods:
     Use this method to add extra data to the context used for rendering the template. You should get the parent class's context from
     calling super.
     ie:
+
 .. code-block:: python
 
       def templated_email_get_context_data(self, **kwargs):
@@ -334,6 +346,7 @@ Methods:
 **templated_email_get_send_email_kwargs(self, valid, form)** (optional):
     Add or change the kwargs that will be used to send the e-mail. You should call super to get the default kwargs.
     ie:
+
 .. code-block:: python
 
     def templated_email_get_send_email_kwargs(valid, form):

setup.py

@@ -11,8 +11,7 @@
     pass
 
 requirements = [
-    'django-render-block>=0.5',
-    'six>=1',
+    'django-render-block>=0.5'
 ]
 
 # python setup.py publish
@@ -25,12 +24,10 @@
     'Intended Audience :: Developers',
     'License :: OSI Approved :: MIT License',
     'Operating System :: OS Independent',
-    'Programming Language :: Python :: 2',
-    'Programming Language :: Python :: 2.7',
-    'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.4',
-    '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 :: Software Development :: Libraries :: Python Modules',
     'Framework :: Django',
 ]
@@ -46,6 +43,7 @@
     license='MIT',
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
+    long_description_content_type='text/x-rst',
     platforms=['any'],
     classifiers=CLASSIFIERS,
     install_requires=requirements,

templated_email/__init__.py

@@ -1,8 +1,6 @@
 from django.conf import settings
 from django.utils.module_loading import import_string
 
-import six
-
 from templated_email.backends.vanilla_django import TemplateBackend
 from templated_email.utils import InlineImage  # noqa
 
@@ -20,7 +18,7 @@ def get_connection(backend=None, template_prefix=None, template_suffix=None,
     # django.core.mail.get_connection
     klass_path = backend or getattr(settings, 'TEMPLATED_EMAIL_BACKEND',
                                     TemplateBackend)
-    if isinstance(klass_path, six.string_types):
+    if isinstance(klass_path, str):
         try:
             # First check if class name is omitted and we have module in settings
             klass = import_string(klass_path + '.' + 'TemplateBackend')

templated_email/backends/vanilla_django.py

@@ -5,7 +5,7 @@
 from django.conf import settings
 from django.core.mail import get_connection
 from django.template import Context
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.core.files.storage import default_storage
 
 from templated_email.utils import (

templated_email/migrations/0001_initial.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-10-05 17:09
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 import uuid

templated_email/urls.py

@@ -1,8 +1,8 @@
-from django.conf.urls import url
+from django.urls import re_path
 
 from templated_email.views import ShowEmailView
 
 app_name = 'templated_email'
 urlpatterns = [
-    url(r'^email/(?P<uuid>([a-f\d]{32})|([a-f\d]{8}(-[a-f\d]{4}){3}-[a-f\d]{12}))/$', ShowEmailView.as_view(), name='show_email'),
+    re_path(r'^email/(?P<uuid>([a-f\d]{32})|([a-f\d]{8}(-[a-f\d]{4}){3}-[a-f\d]{12}))/$', ShowEmailView.as_view(), name='show_email'),
 ]

templated_email/utils.py

@@ -6,12 +6,10 @@
 from django.utils.module_loading import import_string
 from django.conf import settings
 
-import six
-
 
 def _get_klass_from_config(config_variable, default):
     klass_path = getattr(settings, config_variable, default)
-    if isinstance(klass_path, six.string_types):
+    if isinstance(klass_path, str):
         klass_path = import_string(klass_path)
 
     return klass_path

tests/backends/test_vanilla_django_backend.py

@@ -426,7 +426,7 @@ def test_send_attachment_mime_base(self, render_mock):
                           attachments=[MIMEImage(TXT_FILE, 'text/plain')])
         attachment = mail.outbox[0].attachments[0]
         self.assertEqual(decode_b64_msg(attachment.get_payload()),
-                          TXT_FILE)
+                         TXT_FILE)
 
     @patch.object(
         template_backend_klass, '_render_email',
@@ -439,7 +439,7 @@ def test_send_attachment_tripple(self, render_mock):
                           attachments=[('black_pixel.png', TXT_FILE, 'text/plain')])
         attachment = mail.outbox[0].attachments[0]
         self.assertEqual(('black_pixel.png', TXT_FILE, 'text/plain'),
-                          attachment)
+                         attachment)
 
     @patch.object(
         template_backend_klass, '_render_email',
@@ -453,7 +453,7 @@ def test_get_email_message_attachment_mime_base(self, mock):
             attachments=[MIMEImage(TXT_FILE, 'text/plain')])
         attachment = message.attachments[0]
         self.assertEqual(decode_b64_msg(attachment.get_payload()),
-                          TXT_FILE)
+                         TXT_FILE)
 
     @patch.object(
         template_backend_klass, '_render_email',
@@ -467,7 +467,7 @@ def test_get_email_message_attachment_tripple(self, mock):
             attachments=[('black_pixel.png', TXT_FILE, 'text/plain')])
         attachment = message.attachments[0]
         self.assertEqual(('black_pixel.png', TXT_FILE, 'text/plain'),
-                          attachment)
+                         attachment)
 
     def test_removal_of_legacy(self):
         try:

tests/generic_views/test_views.py

@@ -105,7 +105,7 @@ def test_form_valid_with_send_on_success(self):
         self.assertEqual(Author.objects.count(), 1)
         self.assertEqual(len(mail.outbox), 1)
         self.assertEqual(mail.outbox[0].alternatives[0][0].strip(),
-                          'Andre - [email protected]')
+                         'Andre - [email protected]')
 
     def test_form_valid_with_send_on_success_false(self):
         default_value = AuthorCreateView.templated_email_send_on_success
@@ -130,7 +130,7 @@ def test_form_invalid_with_send_on_failure(self):
         self.assertEqual(Author.objects.count(), 0)
         self.assertEqual(len(mail.outbox), 1)
         self.assertEqual(mail.outbox[0].alternatives[0][0].strip(),
-                          '* Enter a valid email address.')
+                         '* Enter a valid email address.')
         AuthorCreateView.templated_email_send_on_failure = default_value
 
     @override_settings(TEMPLATED_EMAIL_FROM_EMAIL='[email protected]')

tests/test_urls.py

@@ -1,5 +1,6 @@
-from django.conf.urls import url, include
+from django.conf.urls import include
+from django.urls import re_path
 
 urlpatterns = [
-    url(r'^', include('templated_email.urls', namespace='templated_email')),
+    re_path(r'^', include('templated_email.urls', namespace='templated_email')),
 ]

tests/test_utils.py

@@ -49,6 +49,6 @@ def test_attach_to_message(self):
         self.inline_image.attach_to_message(message)
         mimeimage = message.attach.call_args[0][0]
         self.assertEqual(mimeimage.get('Content-ID'),
-                          self.inline_image._content_id)
+                         self.inline_image._content_id)
         self.assertEqual(mimeimage.get('Content-Disposition'),
-                          'inline; filename="foo.png"')
+                         'inline; filename="foo.png"')

tox-requirements.txt

@@ -6,5 +6,4 @@ mock
 pytest
 pytest-django
 pytest-pythonpath
-six
 tox

tox.ini

@@ -1,10 +1,7 @@
 [tox]
 envlist =
     py36-{flake8},
-    {py34,py35,py36,py37}-django{20}
-    {py35,py36,py37}-django{21}
-    {py35,py36,py37,py38}-django{22}
-    {py36,py37,py38}-django{30}
+    {py36,py37,py38,py39}-django{22,31,32}
 
 
 [testenv]
@@ -13,12 +10,11 @@ commands=
 deps=
     -rtox-requirements.txt
     pytest-cov
-    django20: Django==2.0
-    django21: Django==2.1
     django22: Django==2.2
-    django30: Django==3.0
+    django31: Django==3.1
+    django32: Django==3.2
 
-[testenv:py27-flake8]
+[testenv:py36-flake8]
 commands = flake8 templated_email tests --ignore=E501
 deps =
     flake8