From d28f11468c26648b7c48358a7d95f4dd79b80729 Mon Sep 17 00:00:00 2001
From: Bob Cribbs <bocribbz@users.noreply.github.com>
Date: Tue, 10 Nov 2015 14:37:24 +0000
Subject: [PATCH] Add tox and make travis run tox tests

---
 .travis.yml | 26 ++++++++++++--------------
 tox.ini     | 10 ++++++++++
 2 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 tox.ini

diff --git a/.travis.yml b/.travis.yml
index 77ba0f6..2c16283 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,20 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
-  - "3.3"
-script: ./example/manage.py test authority
 env:
-  - TRAVIS_DJANGO_VERSION=1.3
-  - TRAVIS_DJANGO_VERSION=1.4
-  - TRAVIS_DJANGO_VERSION=1.5
-  - TRAVIS_DJANGO_VERSION=1.6
+  - TOX_ENV=py26-django13
+  - TOX_ENV=py26-django14
+  - TOX_ENV=py26-django15
+  - TOX_ENV=py26-django16
+  - TOX_ENV=py27-django13
+  - TOX_ENV=py27-django14
+  - TOX_ENV=py27-django15
+  - TOX_ENV=py27-django16
+  - TOX_ENV=py33-django15
+  - TOX_ENV=py33-django16
 install:
-  - pip install django==$TRAVIS_DJANGO_VERSION --use-mirrors
-matrix:
-  exclude:
-    - python: "3.3"
-      env: TRAVIS_DJANGO_VERSION=1.3
-    - python: "3.3"
-      env: TRAVIS_DJANGO_VERSION=1.4
+  - pip install tox
 notifications:
   email:
     - jason.louard.ward@gmail.com
+script: tox -e $TOX_ENV
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..f4cb34b
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,10 @@
+[tox]
+envlist = {py26,py27}-django{13,14}, {py26,py27,py33}-django{15,16}
+
+[testenv]
+commands = python example/manage.py test authority
+deps =
+    django13: Django>=1.3, <1.4
+    django14: Django>=1.4, <1.5
+    django15: Django>=1.5, <1.6
+    django16: Django>=1.6, <1.7