Merge pull request #5 from novafloss/5-django-1.8

Django 1.8 migration
peopledoc · Jun 22, 2016 · 3a8c32f · 3a8c32f
2 parents 51c83c9 + d06e3f5
commit 3a8c32f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ python: 2.7
 env:
     - TOX_ENV=py27-django16
     - TOX_ENV=py27-django17
+    - TOX_ENV=py27-django18
     - TOX_ENV=flake8
 script: tox -e $TOX_ENV
 install:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## master
 
-* Nothing changed yet.
+* Django 1.8 compatibility, thank you ``tox`` (#5).
 
 ## v0.0.5
 

diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
-envlist = py27-django{16,17},flake8
+envlist = py27-django{16,17,18},flake8
 
 [testenv]
 usedevelop = True
 deps =
     django16: Django>=1.6,<1.7
     django17: Django>=1.7,<1.8
+    django18: Django>=1.8,<1.9
     flake8: flake8
 commands =
     pip install -e demo/