From 69ea93fd4ee8fb0e2aa10a41a991436844db74a9 Mon Sep 17 00:00:00 2001
From: Ryan Hiebert <ryan@ryanhiebert.com>
Date: Mon, 22 Jun 2015 13:16:45 -0500
Subject: [PATCH 1/3] Mark Django 1.7 as supported in setup.py

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index fd23a62c..cdc90ddf 100644
--- a/setup.py
+++ b/setup.py
@@ -7,6 +7,6 @@ setup(
         'Private :: Do Not Upload',
     ],
     install_requires=[
-        'Django>=1.8'
+        'Django>=1.7'
     ],
 )

From f435762773786486387af94595eabcb6064dfb3d Mon Sep 17 00:00:00 2001
From: Ryan Hiebert <ryan@ryanhiebert.com>
Date: Tue, 16 Jun 2015 00:50:20 -0600
Subject: [PATCH 2/3] Add Django 1.7 to the build matrix

---
 tox.ini | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 4cdd9978..60a6cf87 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,15 @@
 [tox]
-envlist = py{27,33,34}
+envlist = py{27,33,34}-django{17,18}
+
+[tox:travis]
+2.7 = py27-django{17,18}
+3.3 = py33-django{17,18}
+3.4 = py34-django{17,18}
 
 [testenv]
 deps =
     pytest
     pytest-xdist
+    django17: Django>=1.7,<1.8
+    django18: Django>=1.8,<1.9
 commands = py.test {posargs}

From 17eb54e18ae35a75d44a2afc3c261d3263bc59ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Stenstro=CC=88m?= <em@kth.se>
Date: Mon, 22 Jun 2015 22:37:07 +0200
Subject: [PATCH 3/3] Change test setup to make test run on Django 1.7.

---
 tests/django_test_setup.py | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/tests/django_test_setup.py b/tests/django_test_setup.py
index ce1c3477..6a464388 100644
--- a/tests/django_test_setup.py
+++ b/tests/django_test_setup.py
@@ -2,11 +2,20 @@ import django
 from django.conf import settings
 
 if not settings.configured:
-    settings.configure(
-        INSTALLED_APPS=('django_components',),
-        TEMPLATES=[{
-            'BACKEND': 'django.template.backends.django.DjangoTemplates',
-            'DIRS': ["tests/templates/"],
-        }]
-    )
+    # Django 1.8 changes how you set up templates, so use different
+    # settings for different Django versions
+    if django.VERSION >= (1, 8):
+        settings.configure(
+            INSTALLED_APPS=('django_components',),
+            TEMPLATES=[{
+                'BACKEND': 'django.template.backends.django.DjangoTemplates',
+                'DIRS': ["tests/templates/"],
+            }]
+        )
+    else:
+        settings.configure(
+            INSTALLED_APPS=('django_components',),
+            TEMPLATE_DIRS=["tests/templates/"],
+        )
+
     django.setup()