From 54f1ccca01e1a2d2062ad76af9c559723edd435c Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Thu, 14 Jul 2016 13:06:30 -0400
Subject: [PATCH] Add testing for Django 1.10

---
 .travis.yml        | 4 ++++
 docs/changelog.rst | 2 ++
 setup.py           | 1 +
 tox.ini            | 5 +++--
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 97eec8c..1b00d5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,12 @@ env:
   matrix:
     - TOXENV=py27-django-18
     - TOXENV=py27-django-19
+    - TOXENV=py27-django-110
     - TOXENV=py27-django-master
     - TOXENV=py33-django-18
     - TOXENV=py34-django-18
     - TOXENV=py34-django-19
+    - TOXENV=py34-django-110
     - TOXENV=py34-django-master
   global:
     - PIP_WHEEL_DIR=$HOME/.wheels
@@ -18,6 +20,8 @@ matrix:
       env: TOXENV=py35-django-18
     - python: 3.5
       env: TOXENV=py35-django-19
+    - python: 3.5
+      env: TOXENV=py35-django-110
     - python: 3.5
       env: TOXENV=py35-django-master
 install:
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 873c33d..bdb061a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,8 @@ This page details the changes in the various ``django-formtools`` releases.
 - Added the ``request`` parameter to :meth:`FormPreview.parse_params()
   <formtools.preview.FormPreview.parse_params>`.
 
+- Added support for Django 1.10.
+
 - Dropped support for Django 1.7 and Python 3.2 on Django 1.8.
 
 1.0 (2015-03-25)
diff --git a/setup.py b/setup.py
index f644a32..74b7358 100644
--- a/setup.py
+++ b/setup.py
@@ -127,6 +127,7 @@ setup(
         'Framework :: Django',
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
diff --git a/tox.ini b/tox.ini
index 01961fa..8ef281e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 args_are_paths = false
 envlist =
-    {py27,py34}-django-{18,19,master}
+    {py27,py34}-django-{18,19,110,master}
     py33-django-{18}
-    py35-django-{18,19,master}
+    py35-django-{18,19,110,master}
 
 [testenv]
 basepython =
@@ -18,5 +18,6 @@ pip_pre = true
 deps =
     django-18: Django>=1.8,<1.9
     django-19: Django>=1.9,<1.10
+    django-110: Django>=1.10a1,<1.11
     django-master: https://github.com/django/django/archive/master.tar.gz
     -r{toxinidir}/tests/requirements.txt