From a35ba9395d6431b2fb34942fb405dc4a4978d676 Mon Sep 17 00:00:00 2001
From: medmunds <medmunds@gmail.com>
Date: Thu, 17 Jan 2019 11:14:01 -0800
Subject: [PATCH] Tox/Travis: enable Django 2.2alpha testing

---
 .travis.yml                         |   5 ++
 tests/test_settings/settings_2_2.py |   2 +-
 tests/test_settings/settings_3_0.py | 121 ++++++++++++++++++++++++++++
 tox.ini                             |   3 +-
 4 files changed, 128 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_settings/settings_3_0.py

diff --git a/.travis.yml b/.travis.yml
index 6b8f688..4344e3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,11 @@ matrix:
     - { env: DJANGO=2.1 RUN_LIVE_TESTS=true, python: 3.6 }
     - { env: DJANGO=2.1, python: 3.7, dist: xenial, sudo: true }
     - { env: DJANGO=2.1, python: pypy3 }
+    # Django 2.2: Python 3.5, 3.6, or 3.7
+    - { env: DJANGO=2.2, python: 3.5 }
+    - { env: DJANGO=2.2, python: 3.6 }
+    - { env: DJANGO=2.2, python: 3.7, dist: xenial, sudo: true }
+    - { env: DJANGO=2.2, python: pypy3 }
     # Django development master (direct from GitHub source):
     - { env: DJANGO=master, python: 3.6 }
 
diff --git a/tests/test_settings/settings_2_2.py b/tests/test_settings/settings_2_2.py
index da7e589..beed3ac 100644
--- a/tests/test_settings/settings_2_2.py
+++ b/tests/test_settings/settings_2_2.py
@@ -1,7 +1,7 @@
 """
 Django settings for Anymail tests.
 
-Generated by 'django-admin startproject' using Django 2.2.dev20180524181819.
+Generated by 'django-admin startproject' using Django 2.2a1.
 
 For more information on this file, see
 https://docs.djangoproject.com/en/dev/topics/settings/
diff --git a/tests/test_settings/settings_3_0.py b/tests/test_settings/settings_3_0.py
new file mode 100644
index 0000000..beed3ac
--- /dev/null
+++ b/tests/test_settings/settings_3_0.py
@@ -0,0 +1,121 @@
+"""
+Django settings for Anymail tests.
+
+Generated by 'django-admin startproject' using Django 2.2a1.
+
+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/'
diff --git a/tox.ini b/tox.ini
index 9f8a01e..4d7a7e5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ envlist =
     django20-py{35,36,py3}
     django111-py{34,35,36,py}
     # ... then prereleases (if available):
-    # django22-py{35,36,37}
+    django22-py{35,36,37}
     djangoMaster-py{36,37}
 
 [testenv]
@@ -25,7 +25,6 @@ deps =
     boto3
     sparkpost
 ignore_outcome =
-    django22: True
     djangoMaster: True
 usedevelop = True
 args_are_paths = False