QA configs updated for Django 1.10.

.travis.yml

@@ -1,11 +1,14 @@
 language: python
 
 python:
+  - 3.5
   - 3.4
   - 3.3
   - 2.7
 
 env:
+  - DJANGO="Django>=1.10,<1.11"
+  - DJANGO="Django>=1.9,<1.10"
   - DJANGO="Django>=1.8,<1.9"
   - DJANGO="Django>=1.7,<1.8"
   - DJANGO="Django>=1.6,<1.7"
@@ -19,16 +22,21 @@ script: coverage run -a --source=siteblocks siteblocks/runtests.py
 matrix:
 
   exclude:
-   - python: 3.4
-     env: DJANGO="Django>=1.4,<1.5"
+   - python: 3.5
+     env: DJANGO="Django>=1.7,<1.8"
+   - python: 3.5
+     env: DJANGO="Django>=1.6,<1.7"
+   - python: 3.5
+     env: DJANGO="Django>=1.5,<1.6"
+
+   - python: 3.3
+     env: DJANGO="Django>=1.10,<1.11"
+   - python: 3.3
+     env: DJANGO="Django>=1.9,<1.10"
+   - python: 3.3
+     env: DJANGO="Django>=1.5,<1.6"
    - python: 3.3
      env: DJANGO="Django>=1.4,<1.5"
-
-  include:
-   - python: 3.4
-     env: DJANGO="Django>=1.8,<1.9"
-   - python: 3.4
-     env: DJANGO="Django>=1.7,<1.8"
 
 after_success:
   coveralls

tox.ini

@@ -1,67 +1,25 @@
 [tox]
-envlist =
-    py27-django14,
-    py27-django15,
-    py27-django16,
-    py27-django17,
-    py27-django18,
-
-    py3-django15,
-    py3-django16,
-    py3-django17,
-    py3-django18
-
-[django14]
-deps = Django>=1.4,<1.5
-
-[django15]
-deps = Django>=1.5,<1.6
-
-[django16]
-deps = Django>=1.6,<1.7
-
-[django17]
-deps = Django>=1.7,<1.8
-
-[django18]
-deps = Django>=1.8,<1.9
+envlist = py{27,32,33,34}-django{15,16,17,18,19,110}
+          py{35}-django{18,19,110}
 
+install_command = pip install {opts} {packages}
+skip_missing_interpreters = True
 
 [testenv]
-commands = python siteblocks/runtests.py
-
-[testenv:py27-django14]
-basepython = python2.7
-deps = {[django14]deps}
+basepython =
+    py27: python2.7
+    py32: python3.2
+    py33: python3.3
+    py34: python3.4
+    py35: python3.5
 
-[testenv:py27-django15]
-basepython = python2.7
-deps = {[django15]deps}
-
-[testenv:py27-django16]
-basepython = python2.7
-deps = {[django16]deps}
-
-[testenv:py27-django17]
-basepython = python2.7
-deps = {[django17]deps}
-
-[testenv:py27-django18]
-basepython = python2.7
-deps = {[django18]deps}
-
-[testenv:py3-django15]
-basepython = python3
-deps = {[django15]deps}
-
-[testenv:py3-django16]
-basepython = python3
-deps = {[django16]deps}
-
-[testenv:py3-django17]
-basepython = python3
-deps = {[django17]deps}
+commands = python siteblocks/runtests.py
 
-[testenv:py3-django18]
-basepython = python3
-deps = {[django18]deps}
+deps =
+    mock
+    django15: Django>=1.5,<1.6
+    django16: Django>=1.6,<1.7
+    django17: Django>=1.7,<1.8
+    django18: Django>=1.8,<1.9
+    django19: Django>=1.9,<1.10
+    django110: Django>=1.10,<1.11