Merge pull request #2 from beproud/django18

added test suite for django1.8
beproud · May 2, 2016 · 4710848 · 4710848
2 parents 3aa2ffa + 40f0e71
commit 4710848
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ env:
     - TOXENV=django15-py27
     - TOXENV=django16-py27
     - TOXENV=django17-py27
+    - TOXENV=django18-py27
 
 install:
   - pip install tox

diff --git a/tox.ini b/tox.ini
@@ -3,7 +3,8 @@
 envlist = django14-py27,
           django15-py27,
           django16-py27,
-          django17-py27
+          django17-py27,
+          django18-py27
 
 [testenv]
 commands=python setup.py test
@@ -50,6 +51,11 @@ deps=
     Django>=1.7,<1.8
     django-jsonfield==0.9.13
 
+[django18]
+deps=
+    Django>=1.8,<1.9
+    django-jsonfield==0.9.13
+
 # Django 1.4
 
 [testenv:django14-py27]
@@ -81,3 +87,9 @@ basepython={[py27]basepython}
 deps=
     {[django17]deps}
     {[base]deps}
+
+[testenv:django18-py27]
+basepython={[py27]basepython}
+deps=
+    {[django18]deps}
+    {[base]deps}