From e555cd9aaed60d92d17855dd3361a5d4edfc9a5f Mon Sep 17 00:00:00 2001
From: Tymur Maryokhin <maryokhin@gmail.com>
Date: Thu, 2 Apr 2015 11:58:41 +0200
Subject: [PATCH] Add Django 1.8 to the build

---
 .travis.yml | 3 +++
 tox.ini     | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cf312b522..f0044c886 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,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
diff --git a/tox.ini b/tox.ini
index e89db018f..1bc432875 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist = {py26,py27,py33,py34}-django{15,16},
-          {py27,py33,py34}-django17
+          {py27,py33,py34}-django{17,18}
 
 [testenv]
 commands = py.test tests
@@ -11,6 +11,7 @@ deps =
     django15: Django>=1.5, <1.6
     django16: Django>=1.6, <1.7
     django17: Django>=1.7, <1.8
+    django18: Django>=1.8, <1.9
     {py26,py27}: mock==1.0.1
     boto>=2.32.0
     pytest==2.6.4