Toxify the project

.gitignore

@@ -2,6 +2,7 @@
 *.pot
 *.pyc
 local_settings.py
+.tox/
 
 build/
 dist/

.travis.yml

@@ -1,12 +1,25 @@
 language: python
-python:
-  - "2.7"
-  - "3.4"
 env:
-    - DJANGO="Django>=1.6,<1.7" SOUTH='https://bitbucket.org/andrewgodwin/south/get/default.zip'
-    - DJANGO='https://github.com/django/django/archive/1.7c2.zip' SOUTH=''
+    - TOX_ENV=py27-dj-1.6
+    - TOX_ENV=py27-dj-1.7
+    - TOX_ENV=py27-dj-1.8
+    - TOX_ENV=py27-dj-master
+    - TOX_ENV=py33-dj-1.6
+    - TOX_ENV=py33-dj-1.7
+    - TOX_ENV=py33-dj-1.8
+    - TOX_ENV=py33-dj-master
+    - TOX_ENV=py34-dj-1.6
+    - TOX_ENV=py34-dj-1.7
+    - TOX_ENV=py34-dj-1.8
+    - TOX_ENV=py34-dj-master
+
+matrix:
+    allow_failures:
+        - env: TOX_ENV=py27-dj-master
+        - env: TOX_ENV=py33-dj-master
+        - env: TOX_ENV=py34-dj-master
+
 install:
-    - pip install -U mock $DJANGO $SOUTH
-    - pip install .
+    - pip install tox
 
-script: ./runtests.py
+script: tox -e $TOX_ENV

README.md

@@ -121,6 +121,7 @@ pending_state_log = StateLog.pending_objects.get_for_object(article)
 
 ## Running Tests
 
-```
-./runtests.py
+```bash
+$ pip install tox
+$ tox
 ```

tox.ini

@@ -0,0 +1,13 @@
+[tox]
+envlist =
+    {py27,py33,py34}-dj-{1.6,1.7,1.8,master}
+
+[testenv]
+commands = ./runtests.py
+deps =
+    dj-1.6: Django==1.6.11
+    dj-1.6: South==1.0.2
+    dj-1.7: Django==1.7.8
+    dj-1.8: Django==1.8.2
+    dj-master: https://github.com/django/django/archive/master.tar.gz
+    mock