From 754592c450c4ce49abd4f77ac694540a8fa8bda7 Mon Sep 17 00:00:00 2001
From: Craig Bruce <craig@eyesopen.com>
Date: Fri, 5 Sep 2014 14:21:46 -0700
Subject: [PATCH] django 1.7 tests use 1.7.0 not the RC in tox. Added python34
 and django17 environments to travis config

---
 .travis.yml | 5 +++++
 README.rst  | 2 +-
 tox.ini     | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bdc9bfe25..d859c4135 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,13 @@ env:
   - TOX_ENV=py27-django14
   - TOX_ENV=py27-django15
   - TOX_ENV=py27-django16
+  - TOX_ENV=py27-django17
   - TOX_ENV=py33-django15
   - TOX_ENV=py33-django16
+  - TOX_ENV=py33-django17
+  - TOX_ENV=py34-django15
+  - TOX_ENV=py34-django16
+  - TOX_ENV=py34-django17
   - TOX_ENV=docs
 
 install:
diff --git a/README.rst b/README.rst
index 50a26b84b..f32a3aeae 100644
--- a/README.rst
+++ b/README.rst
@@ -41,7 +41,7 @@ Requirements
 ------------
 
 * Python 2.6, 2.7, 3.3, 3.4
-* Django 1.4, 1.5, 1.6, 1.7rc1
+* Django 1.4, 1.5, 1.6, 1.7
 
 Installation
 ------------
diff --git a/tox.ini b/tox.ini
index 258b64c82..47027020b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -55,7 +55,7 @@ deps =
 [testenv:py27-django17]
 basepython = python2.7
 deps =
-    https://www.djangoproject.com/download/1.7c1/tarball/
+    Django<1.8
     {[testenv]deps}
 
 [testenv:py33-django15]
@@ -74,7 +74,7 @@ deps =
 [testenv:py33-django17]
 basepython = python3.3
 deps =
-    https://www.djangoproject.com/download/1.7c1/tarball/
+    Django<1.8
     {[testenv]deps}
 
 [testenv:py34-django15]
@@ -93,7 +93,7 @@ deps =
 [testenv:py34-django17]
 basepython = python3.4
 deps =
-    https://www.djangoproject.com/download/1.7c1/tarball/
+    Django<1.8
     {[testenv]deps}
 
 [testenv:docs]