Merge pull request #74 from felixxm/bumped-django-versions

Bumped Django versions.
pinax · Jan 21, 2017 · bcd2f81 · bcd2f81
2 parents 5b62f7a + f733d6c
commit bcd2f81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ env:
   - TOXENV=py27-django18-test
   - TOXENV=py27-django19-test
   - TOXENV=py27-django110-test
-  - TOXENV=py27-djangomaster-test
+  - TOXENV=py27-django111-test
   - TOXENV=py33-django15-test
   - TOXENV=py33-django16-test
   - TOXENV=py33-django17-test
@@ -17,14 +17,16 @@ env:
   - TOXENV=py34-django18-test
   - TOXENV=py34-django19-test
   - TOXENV=py34-django110-test
+  - TOXENV=py34-django111-test
   - TOXENV=py34-djangomaster-test
   - TOXENV=py27-flake
   - TOXENV=py33-flake
   - TOXENV=py34-flake
   - TOXENV=checkmanifest
 matrix:
   allow_failures:
-    - env: TOXENV=py27-djangomaster-test
+    - env: TOXENV=py27-django111-test
+    - env: TOXENV=py34-django111-test
     - env: TOXENV=py34-djangomaster-test
 install:
   - pip install coveralls tox>=2.1

diff --git a/tox.ini b/tox.ini
@@ -28,9 +28,10 @@ deps =
     django15: Django==1.5.12
     django16: Django==1.6.11
     django17: Django==1.7.11
-    django18: Django==1.8.15
-    django19: Django==1.9.10
-    django110: Django==1.10.1
+    django18: Django==1.8.17
+    django19: Django==1.9.12
+    django110: Django==1.10.5
+    django111: Django==1.11a1
     djangomaster: https://github.com/django/django/archive/master.tar.gz
     flake: flake8==3.2.1