Add tests for Django 1.7

.travis.yml

@@ -2,18 +2,19 @@ language: python
 
 services: sqlite
 
-env:
-    - DJANGO="django==1.6.5"
-    - DJANGO="django==1.5.8"
-    - DJANGO="django==1.4.13"
-
 python:
     - "2.6"
     - "2.7"
     - "3.2"
     - "3.3"
     - "3.4"
 
+env:
+    - DJANGO="django==1.7"
+    - DJANGO="django==1.6.5"
+    - DJANGO="django==1.5.8"
+    - DJANGO="django==1.4.13"
+
 install:
     - pip install $DJANGO
     - pip install -r requirements.txt
@@ -24,6 +25,8 @@ script:
 
 matrix:
   exclude:
+    - python: "2.6"
+      env: DJANGO="django==1.7"
     - python: "3.2"
       env: DJANGO="django==1.4.13"
     - python: "3.3"

tests/conftest.py

@@ -1,7 +1,14 @@
 import os
+
+import django
 from django.conf import settings
 
 
 def pytest_configure():
     if not settings.configured:
         os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
+
+    try:
+        django.setup()
+    except AttributeError:
+        pass

tox.ini

@@ -1,23 +1,50 @@
 [tox]
 downloadcache = {toxworkdir}/cache/
 envlist =
-       py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,
-       py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,
-       py2.7-django1.4,py2.6-django1.4
+      py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7,
+      py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,
+      py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,
+      py2.7-django1.4,py2.6-django1.4
 
 [testenv]
 commands = ./runtests.py --fast
 
 [testenv:flake8]
 basepython = python2.7
+commands = ./runtests.py --lintonly
 deps = Django
       -rrequirements.txt
       -rrequirements-test.txt
-commands = ./runtests.py --lintonly
+
+[testenv:py3.4-django1.7]
+basepython = python3.4
+deps = Django==1.7
+      -rrequirements.txt
+      -rrequirements-test.txt
+
+[testenv:py3.3-django1.7]
+basepython = python3.3
+deps = Django==1.7
+      -rrequirements.txt
+      -rrequirements-test.txt
+
+[testenv:py3.2-django1.7]
+basepython = python3.2
+deps = Django==1.7
+      -rrequirements.txt
+      -rrequirements-test.txt
+
+[testenv:py2.7-django1.7]
+basepython = python2.7
+deps = Django==1.7
+      -rrequirements.txt
+      -rrequirements-test.txt
 
 [testenv:py3.4-django1.6]
 basepython = python3.4
 deps = Django==1.6.3
+      -rrequirements.txt
+      -rrequirements-test.txt
 
 [testenv:py3.3-django1.6]
 basepython = python3.3