Merge pull request #24 from mrjmad/master

Add django 1.11 configuration in tests
peopledoc · Sep 7, 2017 · bd7bd0a · bd7bd0a
2 parents 9270a89 + af0acbb
commit bd7bd0a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ env:
   - TOXENV=py27-django18
   - TOXENV=py27-django19
   - TOXENV=py27-django110
+  - TOXENV=py27-django111
   - TOXENV=isort
   - TOXENV=flake8
 
@@ -21,5 +22,7 @@ matrix:
       env: TOXENV=py35-django19
     - python: 3.5
       env: TOXENV=py35-django110
+    - python: 3.5
+      env: TOXENV=py35-django111
     - python: 3.5
       env: TOXENV=flake8
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,7 +4,7 @@ Changelog for django-x509
 0.5 (unreleased)
 ----------------
 
-- Add Python3 and Django 1.10 support.
+- Add Python3 and Django 1.10 and 1.11 support.
 - Explicit on_delete behaviour for ForeignKeys
 
 

diff --git a/tox.ini b/tox.ini
@@ -1,12 +1,13 @@
 [tox]
-envlist = flake8,isort,py27-django{18,19,110},py35-django{18,19,110}
+envlist = flake8,isort,py27-django{18,19,110,111},py35-django{18,19,110,111}
 
 [testenv]
 usedevelop = True
 deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
+    django111: Django>=1.11,<2.0
     -rrequirements.txt
 commands =
     django-admin test --settings=x509.tests.settings_for_tests