From 0e99bcf42e538de293098621852d67b997870d43 Mon Sep 17 00:00:00 2001
From: medmunds <medmunds@gmail.com>
Date: Tue, 15 May 2018 11:08:20 -0700
Subject: [PATCH] Travis/tox: drop Python 3.3; shrink Travis matrix

Discontinue support/testing for Python 3.3 with Django 1.8.
Closes #99

Focus Travis testing on currently-supported Django/Python combinations.
(But keep a few older ones in the matrix, too.)
---
 .travis.yml | 34 ++++++++++++++++------------------
 tox.ini     |  2 +-
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d9ddadc..37d5af7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,30 +13,14 @@ matrix:
   include:
     - { env: LINT_AND_DOCS=true, python: 3.6 }
 
-    # Anymail supports the same python versions as Django, excluding Python 3.2, but adding pypy.
+    # Anymail supports the same Python versions as Django, plus PyPy.
     # https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
 
     # Live API integration tests are only run on a few, representative Python/Django version
     # combinations, to avoid rapidly consuming the testing accounts' entire send allotments.
 
-    # Django 1.8: Python 2.7, 3.3, 3.4, 3.5
-    - { env: DJANGO=1.8 RUN_LIVE_TESTS=true, python: 2.7 }
-    - { env: DJANGO=1.8, python: 3.3 }
-    - { env: DJANGO=1.8, python: 3.4 }
-    - { env: DJANGO=1.8, python: 3.5 }
-    - { env: DJANGO=1.8, python: pypy }
-    # Django 1.9: Python 2.7, 3.4, 3.5
-    - { env: DJANGO=1.9, python: 2.7 }
-    - { env: DJANGO=1.9, python: 3.4 }
-    - { env: DJANGO=1.9, python: 3.5 }
-    - { env: DJANGO=1.9, python: pypy }
-    # Django 1.10: Python 2.7, 3.4, 3.5
-    - { env: DJANGO=1.10, python: 2.7 }
-    - { env: DJANGO=1.10, python: 3.4 }
-    - { env: DJANGO=1.10, python: 3.5 }
-    - { env: DJANGO=1.10, python: pypy }
     # Django 1.11: Python 2.7, 3.4, 3.5, or 3.6
-    - { env: DJANGO=1.11, python: 2.7 }
+    - { env: DJANGO=1.11 RUN_LIVE_TESTS=true, python: 2.7 }
     - { env: DJANGO=1.11, python: 3.4 }
     - { env: DJANGO=1.11, python: 3.5 }
     - { env: DJANGO=1.11, python: 3.6 }
@@ -52,6 +36,20 @@ matrix:
     - { env: DJANGO=master, python: 3.6 }
     - { env: DJANGO=master, python: 3.7-dev }
 
+    # Obsolete Django versions (no longer supported by Django)
+    # Anymail tries to support these, but doesn't test every possible combination...
+    # Django 1.8: Python 2.7, 3.3, 3.4, 3.5
+    - { env: DJANGO=1.8, python: 2.7 }
+    - { env: DJANGO=1.8, python: 3.4 }
+    - { env: DJANGO=1.8, python: 3.5 }
+    - { env: DJANGO=1.8, python: pypy }
+    # Django 1.9: Python 2.7, 3.4, 3.5
+    - { env: DJANGO=1.9, python: 2.7 }
+    - { env: DJANGO=1.9, python: 3.5 }
+    # Django 1.10: Python 2.7, 3.4, 3.5
+    - { env: DJANGO=1.10, python: 2.7 }
+    - { env: DJANGO=1.10, python: 3.5 }
+
   allow_failures:
     - env: DJANGO=2.1
       python: 3.5
diff --git a/tox.ini b/tox.ini
index 721e260..7e77e0d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ envlist =
     django111-py{27,34,35,36,py2}
     django110-py{27,34,35,py2}
     django19-py{27,34,35,py2}
-    django18-py{33,34,35,py2}
+    django18-py{34,35,py2}
     # ... then prereleases (if available):
     #django21-py{35,36}
     djangoMaster-py{36,37}