From c1d849c8194729a5ac436a46f0eccf9a46997a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gregor=20M=C3=BCllegger?= <gregor@muellegger.de>
Date: Fri, 13 Jun 2014 10:30:17 +0200
Subject: [PATCH] Run tests for django 1.7 with tox.

---
 runtests.py |  2 +-
 tox.ini     | 40 +++++++++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/runtests.py b/runtests.py
index 11f6576..2a013ba 100755
--- a/runtests.py
+++ b/runtests.py
@@ -26,7 +26,7 @@
 
     # Only test south support for Django 1.6 and lower.
     if django.VERSION < (1, 7):
-        default_test_apps = [
+        default_test_apps += [
             'test_south_support',
         ]
 
diff --git a/tox.ini b/tox.ini
index a1098f3..602d6dc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
 envlist =
-    py26-1.4, py26-1.5, py26-1.6,
-    py27-1.4, py27-1.5, py27-1.6,
-              py32-1.5, py32-1.6,
-              py33-1.5, py33-1.6,
-    pypy-1.4, pypy-1.5, pypy-1.6
+    py26-1.5, py26-1.6, py26-master,
+    py27-1.5, py27-1.6, py27-master,
+    py32-1.5, py32-1.6, py32-master,
+    py33-1.5, py33-1.6, py33-master,
+    pypy-1.5, pypy-1.6, pypy-master
 
 [testenv]
 commands = python runtests.py
@@ -12,12 +12,6 @@ install_command = pip install {opts} {packages}
 setenv =
     DJANGO_SETTINGS_MODULE = test_project.settings
 
-[testenv:py26-1.4]
-basepython = python2.6
-deps =
-    Django >=1.4, <1.4.99
-    -r{toxinidir}/requirements/tests.txt
-
 [testenv:py26-1.5]
 basepython = python2.6
 deps =
@@ -30,10 +24,10 @@ deps =
     Django >=1.6, <1.6.99
     -r{toxinidir}/requirements/tests.txt
 
-[testenv:py27-1.4]
-basepython = python2.7
+[testenv:py26-master]
+basepython = python2.6
 deps =
-    Django >=1.4, <1.4.99
+    https://github.com/django/django/archive/master.zip#egg=Django
     -r{toxinidir}/requirements/tests.txt
 
 [testenv:py27-1.5]
@@ -68,6 +62,12 @@ deps =
     Django >=1.6, <1.6.99
     -r{toxinidir}/requirements/tests.txt
 
+[testenv:py32-master]
+basepython = python3.2
+deps =
+    https://github.com/django/django/archive/master.zip#egg=Django
+    -r{toxinidir}/requirements/tests.txt
+
 [testenv:py33-1.5]
 basepython = python3.3
 deps =
@@ -82,10 +82,10 @@ deps =
     Django >=1.6, <1.6.99
     -r{toxinidir}/requirements/tests.txt
 
-[testenv:pypy-1.4]
-basepython = pypy
+[testenv:py33-master]
+basepython = python3.3
 deps =
-    Django >=1.4, <1.4.99
+    https://github.com/django/django/archive/master.zip#egg=Django
     -r{toxinidir}/requirements/tests.txt
 
 [testenv:pypy-1.5]
@@ -99,3 +99,9 @@ basepython = pypy
 deps =
     Django >=1.6, <1.6.99
     -r{toxinidir}/requirements/tests.txt
+
+[testenv:pypy-master]
+basepython = pypy
+deps =
+    https://github.com/django/django/archive/master.zip#egg=Django
+    -r{toxinidir}/requirements/tests.txt