From e02c8817832d20a9c140ffbacc02138c7ec3c4f5 Mon Sep 17 00:00:00 2001
From: Grant McConnaughey <grantmcconnaughey@gmail.com>
Date: Sat, 27 May 2017 09:47:16 -0500
Subject: [PATCH] Update testing matrix

---
 .travis.yml   | 21 ++++++++-------------
 CHANGELOG.rst |  4 ++++
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d2a1f4f..5ecb869 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: python
 python:
   - 2.7
-  - 3.3
   - 3.4
   - 3.5
+  - 3.6
 before_install:
   - pip install coveralls
 install:
@@ -12,19 +12,14 @@ install:
   - pip install Django==${DJANGO}
 script: make test
 env:
-  - DJANGO=1.7.11
-  - DJANGO=1.8.14
-  - DJANGO=1.9.9
-  - DJANGO=1.10.1
+  - DJANGO=1.9.13
+  - DJANGO=1.10.7
+  - DJANGO=1.11.1
 matrix:
   exclude:
-    - python: 3.3
-      env: DJANGO=1.10.1
-    - python: 3.3
-      env: DJANGO=1.9.9
-    - python: 3.5
-      env: DJANGO=1.7.11
-    - python: 3.5
-      env: DJANGO=1.8.14
+    - python: 3.6
+      env: DJANGO=1.9.13
+    - python: 3.6
+      env: DJANGO=1.10.7
 after_success:
   - coveralls
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7cdef78..26103b5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,10 @@ Changelog
     * Added ``verbose_name`` to ``Avatar`` model fields.
     * Improved German translations.
     * Fixed bug where ``rebuild_avatars`` would fail on Django 1.10+.
+    * Added Django 1.11 support.
+    * Added Python 3.6 support.
+    * Removed Django 1.7 and 1.8 support.
+    * Removed Python 3.3 support.
 
 * 3.1.0 (September 10, 2016)
     * Added the ability to override templates using ``AVATAR_ADD_TEMPLATE``, ``AVATAR_CHANGE_TEMPLATE``, and ``AVATAR_DELETE_TEMPLATE``.