Merge pull request #3 from EmilStenstrom/django17

Add support for Django 1.7.

setup.py

@@ -7,6 +7,6 @@ setup(
         'Private :: Do Not Upload',
     ],
     install_requires=[
-        'Django>=1.8'
+        'Django>=1.7'
     ],
 )

tests/django_test_setup.py

@@ -2,6 +2,9 @@ import django
 from django.conf import settings
 
 if not settings.configured:
+    # 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=[{
@@ -9,4 +12,10 @@ if not settings.configured:
                 'DIRS': ["tests/templates/"],
             }]
         )
+    else:
+        settings.configure(
+            INSTALLED_APPS=('django_components',),
+            TEMPLATE_DIRS=["tests/templates/"],
+        )
+
     django.setup()

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}