From a55dbf5e8e3bec0d719a2fb1cc771218e041dd1a Mon Sep 17 00:00:00 2001
From: Ben Lopatin <ben.lopatin@wellfireinteractive.com>
Date: Thu, 2 Jan 2014 22:16:22 -0500
Subject: [PATCH] Set up tox for testing

---
 .gitignore                    |  1 +
 .travis.yml                   | 28 +++++++++------------
 README.rst                    | 17 ++++++++++---
 example/grouptest/settings.py |  2 +-
 tox.ini                       | 47 +++++++++++++++++++++++++++++++++++
 5 files changed, 75 insertions(+), 20 deletions(-)
 create mode 100644 tox.ini

diff --git a/.gitignore b/.gitignore
index a7dce577..dd4c89f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ dist/
 *.egg-info
 docs/_build
 *.sqlite
+.tox
diff --git a/.travis.yml b/.travis.yml
index 60934c9c..703c293d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,15 @@
 language: python
-python:
-  - "2.6"
-  - "2.7"
-  - "3.3"
+python: 2.7
 env:
-  - DJANGO_INSTALL="Django==1.4.10"
-  - DJANGO_INSTALL="Django==1.5.5"
-  - DJANGO_INSTALL="Django==1.6.1"
+  - TOX_ENV=py33-django16
+  - TOX_ENV=py33-django15
+  - TOX_ENV=py27-django16
+  - TOX_ENV=py27-django15
+  - TOX_ENV=py27-django14
+  - TOX_ENV=py26-django16
+  - TOX_ENV=py26-django15
+  - TOX_ENV=py26-django14
 install:
-  - pip install -q $DJANGO_INSTALL
-  - python setup.py -q install
-script:  ./runtests.sh
-matrix:
-  exclude:
-    - python: "3.3"
-      env: DJANGO_INSTALL="Django==1.4.10"
-    - python: "2.6"
-      env: DJANGO_INSTALL="Django==1.6.1"
+  - pip install tox
+script:
+  - tox -e $TOX_ENV
diff --git a/README.rst b/README.rst
index e330cb83..e6786339 100644
--- a/README.rst
+++ b/README.rst
@@ -150,14 +150,25 @@ for me and contributors should include:
 Please use the project's issues tracker to report bugs, doc updates, or other
 requests/suggestions.
 
-Targets
--------
+Targets & testing
+-----------------
 
 The codebase is targeted at tested against:
 
 * Django 1.4.x against Python 2.6 and Python 2.7
 * Django 1.5.x against Python 2.6, Python 2.7, and Python 3.3
-* Django 1.6.x (beta) against Python 2.7 and Python 3.3
+* Django 1.6.x against Python 2.7 and Python 3.3
+
+You can run the tests from the example project using the simple wrapper script:
+
+    ./runtests.sh
+
+To run tests against all target environments, install `tox
+<https://testrun.org/tox/latest/>`_ and then execute the command:
+
+    tox
+
+Yes, that's it.
 
 Submitting
 ----------
diff --git a/example/grouptest/settings.py b/example/grouptest/settings.py
index fdd54600..b64af2b3 100644
--- a/example/grouptest/settings.py
+++ b/example/grouptest/settings.py
@@ -109,7 +109,7 @@
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    os.path.join(PROJECT_ROOT, 'templates/')
+    os.path.join(PROJECT_ROOT, 'templates/'),
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..a86ba5d4
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,47 @@
+[tox]
+envlist = py26-django14, py26-django15, py26-django16, py27-django14, py27-django15, py27-django16, py27-django15, py33-django16
+
+[testenv]
+setenv =
+    PYTHONPATH = {toxinidir}:{toxinidir}/organizations
+commands = ./runtests.sh
+
+[testenv:py26-django14]
+basepython = python2.6
+deps =
+  Django>=1.4,<1.5
+
+[testenv:py26-django15]
+basepython = python2.6
+deps =
+  Django>=1.5,<1.6
+
+[testenv:py26-django16]
+basepython = python2.6
+deps =
+  Django>=1.6,<1.7
+
+[testenv:py27-django14]
+basepython = python2.6
+deps =
+  Django>=1.4,<1.5
+
+[testenv:py27-django15]
+basepython = python2.6
+deps =
+  Django>=1.5,<1.6
+
+[testenv:py27-django16]
+basepython = python2.6
+deps =
+  Django>=1.6,<1.7
+
+[testenv:py33-django15]
+basepython = python3.3
+deps =
+  Django>=1.5,<1.6
+
+[testenv:py33-django16]
+basepython = python3.3
+deps =
+  Django>=1.6,<1.7