Update Django and Python build versions

* Add Django 3.1 builds
* Django main is now 3.2dev; add test settings
* Rough in changelog deprecation notice for Django 1.11
  and Python 2.7
* Travis-CI is apparently supporting pypy3 alias now
* Travis-CI has apparently added Python 3.8 release now

.travis.yml

@@ -35,24 +35,29 @@ matrix:
     # Django 2.0: Python 3.5+
     - { env: TOXENV=django20-py35-all, python: 3.5 }
     - { env: TOXENV=django20-py36-all, python: 3.6 }
-    - { env: TOXENV=django20-pypy3-all, python: pypy3.5 }
+    - { env: TOXENV=django20-pypy3-all, python: pypy3 }
     # Django 2.1: Python 3.5, 3.6, or 3.7
     - { env: TOXENV=django21-py35-all, python: 3.5 }
     - { env: TOXENV=django21-py36-all, python: 3.6 }
     - { env: TOXENV=django21-py37-all, python: 3.7 }
-    - { env: TOXENV=django21-pypy3-all, python: pypy3.5 }
+    - { env: TOXENV=django21-pypy3-all, python: pypy3 }
     # Django 2.2: Python 3.5, 3.6, or 3.7
     - { env: TOXENV=django22-py35-all, python: 3.5 }
     - { env: TOXENV=django22-py36-all, python: 3.6 }
     - { env: TOXENV=django22-py37-all RUN_LIVE_TESTS=true, python: 3.7 }
-    - { env: TOXENV=django22-pypy3-all, python: pypy3.5 }
+    - { env: TOXENV=django22-pypy3-all, python: pypy3 }
     # Django 3.0: Python 3.6, 3.7, or 3.8
     - { env: TOXENV=django30-py36-all, python: 3.6 }
     - { env: TOXENV=django30-py37-all, python: 3.7 }
-    - { env: TOXENV=django30-py38-all, python: 3.8-dev }
+    - { env: TOXENV=django30-py38-all, python: 3.8 }
-    # - { env: TOXENV=django30-pypy3-all, python: pypy3.6 }  # pypy3.6 not yet in Travis-CI
+    - { env: TOXENV=django30-pypy3-all, python: pypy3 }
-    # Django development master (direct from GitHub source):
+    # Django 3.1: Python 3.6, 3.7, or 3.8
-    - { env: TOXENV=djangoMaster-py37-all, python: 3.7 }
+    - { env: TOXENV=django31-py36-all, python: 3.6 }
+    - { env: TOXENV=django31-py37-all, python: 3.7 }
+    - { env: TOXENV=django31-py38-all, python: 3.8 }
+    - { env: TOXENV=django31-pypy3-all, python: pypy3 }
+    # Django current development (direct from GitHub source main branch):
+    - { env: TOXENV=djangoDev-py37-all, python: 3.7 }
     # Install without optional extras (don't need to cover entire matrix)
     - { env: TOXENV=django22-py37-none, python: 3.7 }
     - { env: TOXENV=django22-py37-amazon_ses, python: 3.7 }
@@ -62,7 +67,7 @@ matrix:
     - { env: TOXENV=django22-py37-all-old_urllib3, python: 3.7 }
 
   allow_failures:
-    - env: TOXENV=djangoMaster-py37-all
+    - env: TOXENV=djangoDev-py37-all
       python: 3.7
 
 cache: pip

CHANGELOG.rst

@@ -28,7 +28,10 @@ Release history
 vNext
 -----
 
-*Unreleased changes in master*
+*Unreleased changes in development*
+
+This is an extended support release. Anymail vNext will receive security updates
+and fixes for any breaking ESP API changes through at least July, 2021.
 
 Fixes
 ~~~~~
@@ -36,6 +39,19 @@ Fixes
 * **Amazon SES:** Fix bcc, which wasn't working at all on non-template sends.
   (Thanks to `@mwheels`_ for reporting the issue.)
 
+Features
+~~~~~~~~
+
+* Test against Django 3.1 release candidates
+
+
+Deprecations
+~~~~~~~~~~~~
+
+*  This will be the last Anymail release to support Django 1.11 and Python 2.7.
+
+If these deprecations affect you and you cannot upgrade, set your requirements to
+`django-anymail~=7.2` (a "compatible release" specifier, equivalent to `>=7.2,==7.*`).
 
 
 v7.1

tests/test_settings/settings_3_1.py

@@ -1,7 +1,7 @@
 """
 Django settings for Anymail tests.
 
-Generated by 'django-admin startproject' using Django 3.0a1.
+Generated by 'django-admin startproject' using Django 3.1.
 
 For more information on this file, see
 https://docs.djangoproject.com/en/dev/topics/settings/

tests/test_settings/settings_3_2.py

@@ -0,0 +1,121 @@
+"""
+Django settings for Anymail tests.
+
+Generated by 'django-admin startproject' using Django 3.1.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/dev/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/dev/ref/settings/
+"""
+
+import os
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/dev/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'NOT_FOR_PRODUCTION_USE'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'anymail',
+]
+
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+ROOT_URLCONF = 'tests.test_settings.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'tests.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/dev/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/dev/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/dev/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/dev/howto/static-files/
+
+STATIC_URL = '/static/'

tox.ini

@@ -3,17 +3,18 @@ envlist =
     # Factors: django-python-extras
     # Test these environments first, to catch most errors early...
     lint
-    django22-py37-all
+    django30-py37-all
     django111-py27-all
     docs
     # ... then test all the other supported combinations:
-    django22-py{35,36,py3}-all
+    django30-py{36,38,py3}-all
+    django22-py{35,36,37,py3}-all
     django21-py{35,36,37,py3}-all
     django20-py{35,36,py3}-all
     django111-py{34,35,36,py}-all
     # ... then prereleases (if available):
-    django30-py{36,37,38,py3}-all
+    django31-py{36,37,38,py3}-all
-    djangoMaster-py{36,37,38}-all
+    djangoDev-py{36,37,38}-all
     # ... then partial installation (limit extras):
     django22-py37-{none,amazon_ses,sparkpost}
     # ... then older versions of some dependencies:
@@ -27,8 +28,8 @@ deps =
     django21: django~=2.1.0
     django22: django~=2.2.0
     django30: django~=3.0.0
-    django31: django>=3.1a1
+    django31: django>=3.1rc1
-    djangoMaster: https://github.com/django/django/tarball/master
+    djangoDev: https://github.com/django/django/tarball/master
     old_urllib3: urllib3<1.25
     # testing dependencies (duplicates setup.py tests_require, less optional extras):
     mock
@@ -42,7 +43,7 @@ setenv =
     sparkpost: ANYMAIL_ONLY_TEST=sparkpost
 ignore_outcome =
     # CI that wants to handle errors itself can set TOX_FORCE_IGNORE_OUTCOME=false
-    djangoMaster: {env:TOX_FORCE_IGNORE_OUTCOME:true}
+    djangoDev: {env:TOX_FORCE_IGNORE_OUTCOME:true}
 args_are_paths = false
 commands_pre =
     python -VV