Adds test support for django 1.4 and trunk

2 files changed, 52 insertions, 7 deletions

diff --git a/.travis.yml b/.travis.yml
index ef98664..5723729 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,12 @@ python:
   - "2.6"
   - "2.7"
   - "pypy"
+env:
+  - DJANGO=Django==1.5.0
+  - DJANGO=Django==1.4.5
+  - DJANGO="-e git+git://github.com/django/django.git#egg=Django"
 install:
+  - pip install $DJANGO --use-mirrors
   - make develop
 script:
   - make test
diff --git a/tox.ini b/tox.ini
index ccab5e3..28e06aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,51 @@
-# Tox (http://codespeak.net/~hpk/tox/) is a tool for running tests
-# in multiple virtualenvs. This configuration file will run the
-# test suite on all supported python versions. To use it, "pip install tox"
-# and then run "tox" from this directory.
-
 [tox]
-envlist = py26, py27, pypy
+envlist = py26, py27, pypy, py26-django1.4, py27-django1.4, pypy-django1.4, py26-djangotrunk, py27-djangotrunk, pypy-djangotrunk
 
 [testenv]
 commands = python setup.py test
-deps = pytest
+deps =
+    django==1.5
+    mock
+    pytest
+
+[testenv:py26-django1.4]
+basepython=python2.6
+deps =
+    django==1.4.5
+    mock
+    pytest
+
+[testenv:py27-django1.4]
+basepython = python2.7
+deps =
+    django==1.4.5
+    mock
+    pytest
+
+[testenv:pypy-django1.4]
+basepython = pypy
+deps =
+    django==1.4.5
+    mock
+    pytest
+
+[testenv:py26-djangotrunk]
+basepython=python2.6
+deps =
+    https://github.com/django/django/tarball/master
+    mock
+    pytest
+
+[testenv:py27-djangotrunk]
+basepython = python2.7
+deps =
+    https://github.com/django/django/tarball/master
+    mock
+    pytest
+
+[testenv:pypy-djangotrunk]
+basepython = pypy
+deps =
+    https://github.com/django/django/tarball/master
+    mock
+    pytest