From 6615022fbf267e80ab2b978ee070be99815d48a2 Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjamin@overtag.dk>
Date: Tue, 23 Aug 2016 15:29:43 +0200
Subject: [PATCH] downgrade pytest-django for django\<1.7

---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index e1ad141e..43490cf5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,6 @@ commands =
 deps =
      coverage
      pytest
-     pytest-django
      Pillow==2.3.0
      django-classy-tags==0.4
      six==1.6.1
@@ -21,6 +20,7 @@ deps =
      django{15,16}: django-sekizai==0.7
      django{15,16}: django-mptt==0.7.2
      django{15,16}: sorl-thumbnail==11.12
+     django{15,16}: pytest-django<3
      django17: Django==1.7.8
      django17: django-mptt==0.7.4
      django18: Django==1.8.2
@@ -28,6 +28,7 @@ deps =
      django{18,19}: django-mptt==0.8.0
      django{17,18,19}: django-sekizai==0.9.0
      django{17,18,19}: sorl-thumbnail==12.3
+     django{17,18,19}: pytest-django>=3
      py26: importlib
      py26: Markdown==2.4.1
      py{27,34}: Markdown==2.6.5
-- 
2.45.2