Merge branch 'django-1.10'

mlavin · Nov 12, 2016 · 0d060c1 · 0d060c1
2 parents e2f6a8f + 57221f5
commit 0d060c1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,13 +3,15 @@ sudo: false
 language: python
 
 python:
-  - "3.4"
+  - "3.5"
 
 env:
   - TOXENV=py27-django18-normal,py33-django18-normal
   - TOXENV=py27-django18-custom,py33-django18-custom
   - TOXENV=py27-django19-normal,py34-django19-normal
   - TOXENV=py27-django19-custom,py34-django19-custom
+  - TOXENV=py27-django110-normal,py34-django110-normal,py35-django110-normal
+  - TOXENV=py27-django110-custom,py34-django110-custom,py35-django110-custom
 
 cache:
   directories:

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,33}-django{18}-{normal,custom},py{27,34,35}-django{19}-{normal,custom},docs
+envlist = py{27,33}-django{18}-{normal,custom},py{27,34,35}-django{19,110}-{normal,custom},docs
 
 [testenv]
 commands = coverage run runtests.py
@@ -9,10 +9,11 @@ basepython =
     py34: python3.4
     py35: python3.5
 deps =
-    coverage>=4.0,<4.1
+    coverage>=4.2,<4.3
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
-    py27: mock>=0.8
+    django110: Django>=1.10,<1.11
+    py27: mock>=1.0,<2.0
 setenv =
     custom: SWAPPED=1