From cbd1666d98eb79bf1de12744bbd5905ec173f544 Mon Sep 17 00:00:00 2001
From: medmunds <medmunds@gmail.com>
Date: Tue, 4 Apr 2017 10:20:56 -0700
Subject: [PATCH] Support released (not pre) Django 1.11

---
 .travis.yml | 19 +++++++++++--------
 setup.py    |  1 +
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8423008..e633987 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ matrix:
     # 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.2 (until the end of 2016), 3.3, 3.4, 3.5
+    # Django 1.8: Python 2.7, 3.3, 3.4, 3.5
     - { env: DJANGO=django==1.8 RUN_LIVE_TESTS=true, python: 2.7 }
     - { env: DJANGO=django==1.8, python: 3.3 }
     - { env: DJANGO=django==1.8, python: 3.4 }
@@ -22,14 +22,17 @@ matrix:
     # Django 1.10: Python 2.7, 3.4, 3.5
     - { env: DJANGO=django==1.10, python: 2.7 }
     - { env: DJANGO=django==1.10, python: 3.4 }
-    - { env: DJANGO=django==1.10 RUN_LIVE_TESTS=true, python: 3.5 }
+    - { env: DJANGO=django==1.10, python: 3.5 }
     - { env: DJANGO=django==1.10, python: pypy }
-    # Django 1.11 (prerelease): Python 2.7, 3.4, 3.5, or 3.6
-    - { env: DJANGO="--pre django", python: 2.7 }
-    - { env: DJANGO="--pre django", python: 3.4 }
-    - { env: DJANGO="--pre django", python: 3.5 }
-    - { env: DJANGO="--pre django", python: 3.6 }
-    - { env: DJANGO="--pre django", python: pypy }
+    # Django 1.11: Python 2.7, 3.4, 3.5, or 3.6
+    - { env: DJANGO=django==1.11, python: 2.7 }
+    - { env: DJANGO=django==1.11, python: 3.4 }
+    - { env: DJANGO=django==1.11, python: 3.5 }
+    - { env: DJANGO=django==1.11, python: 3.6 }
+    - { env: DJANGO=django==1.11 RUN_LIVE_TESTS=true, python: pypy }
+    # Django 2.0 (prerelease): Python 3.5+
+    # - { env: DJANGO="--pre django", python: 3.5 }
+    # - { env: DJANGO="--pre django", python: 3.6 }
   # allow_failures:
   #   - env: DJANGO="--pre django"
   #   - python: 3.6
diff --git a/setup.py b/setup.py
index 0094dd7..9fe0fcc 100644
--- a/setup.py
+++ b/setup.py
@@ -57,6 +57,7 @@ setup(
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "License :: OSI Approved :: BSD License",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Framework :: Django",