added tests for Django 1.8, running with Python 2.7, 3.3 and 3.4

diff --git a/.travis.yml b/.travis.yml
index 237760adedc4713a42423af50543e01627b39954..4efc69a53ec0976d1c3bad98afe9400ccad48134 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,15 @@ env:
 - TOX_ENV=py27-django15
 - TOX_ENV=py27-django16
 - TOX_ENV=py27-django17
+- TOX_ENV=py27-django18
 - TOX_ENV=py33-django15
 - TOX_ENV=py33-django16
 - TOX_ENV=py33-django17
+- TOX_ENV=py33-django18
 - TOX_ENV=py34-django15
 - TOX_ENV=py34-django16
 - TOX_ENV=py34-django17
+- TOX_ENV=py34-django18
 install:
 - pip install tox
 script:

diff --git a/tox.ini b/tox.ini
index 0e4232bd1e92fa98806851a96f5be831f6da16f2..8de94053917ebe435031a9eba19dc029b5e6969d 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,7 @@ envlist =
     {py27,py33,py34}-django15,
     {py27,py33,py34}-django16,
     {py27,py33,py34}-django17
+    {py27,py33,py34}-django18
 
 [testenv]
 commands = python setup.py test
@@ -10,6 +11,7 @@ deps =
      django15: Django==1.5.11
      django16: Django==1.6.8
      django17: Django==1.7.1
+     django18: Django==1.8.2
      django-model-utils
      Pillow