From 596093d4941a14ea7443811450c9262c87bcdbd4 Mon Sep 17 00:00:00 2001
From: Tymur Maryokhin <maryokhin@gmail.com>
Date: Thu, 2 Apr 2015 01:15:51 +0200
Subject: [PATCH] Django 1.8 released

---
 .travis.yml | 9 +++++----
 tox.ini     | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3eb89dc4f..71cec7beb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,10 @@ sudo: false
 env:
     - TOX_ENV=py27-flake8
     - TOX_ENV=py27-docs
+    - TOX_ENV=py34-django18
+    - TOX_ENV=py33-django18
+    - TOX_ENV=py32-django18
+    - TOX_ENV=py27-django18
     - TOX_ENV=py34-django17
     - TOX_ENV=py33-django17
     - TOX_ENV=py32-django17
@@ -21,10 +25,7 @@ env:
     - TOX_ENV=py26-django15
     - TOX_ENV=py27-django14
     - TOX_ENV=py26-django14
-    - TOX_ENV=py34-django18beta
-    - TOX_ENV=py33-django18beta
-    - TOX_ENV=py32-django18beta
-    - TOX_ENV=py27-django18beta
+
 
 install:
   - pip install tox
diff --git a/tox.ini b/tox.ini
index 4f2d8183d..befef744a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist =
        py27-{flake8,docs},
        {py26,py27}-django14,
        {py26,py27,py32,py33,py34}-django{15,16},
-       {py27,py32,py33,py34}-django{17,18beta}
+       {py27,py32,py33,py34}-django{17,18}
 
 [testenv]
 commands = ./runtests.py --fast
@@ -14,7 +14,7 @@ deps =
        django15: Django==1.5.6  # Should track minimum supported
        django16: Django==1.6.3  # Should track minimum supported
        django17: Django==1.7.2  # Should track maximum supported
-       django18beta: https://www.djangoproject.com/download/1.8b1/tarball/
+       django18: Django==1.8  # Should track maximum supported
        -rrequirements/requirements-testing.txt
        -rrequirements/requirements-optionals.txt