From 44ceef841543877a700c3fb4a0f84dfecbad0cbb Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 21 Aug 2013 21:30:25 +0100
Subject: Updating 2.4.0 release notes

---
 tox.ini | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index aa97fd35..6ec400dd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -91,6 +91,7 @@ deps = django==1.3.5
        django-oauth-plus==2.0
        oauth2==1.5.211
        django-oauth2-provider==0.2.3
+       six
 
 [testenv:py2.6-django1.3]
 basepython = python2.6
@@ -100,3 +101,4 @@ deps = django==1.3.5
        django-oauth-plus==2.0
        oauth2==1.5.211
        django-oauth2-provider==0.2.3
+       six
-- 
cgit v1.2.3


From e441f85109e64345a12e65062fc0e51c5787e67f Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 25 Sep 2013 10:30:04 +0100
Subject: Drop 1.3 support

---
 tox.ini | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 6e3b8e0a..7bd140e1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 downloadcache = {toxworkdir}/cache/
-envlist = py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,py2.7-django1.4,py2.6-django1.4,py2.7-django1.3,py2.6-django1.3
+envlist = py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,py2.7-django1.4,py2.6-django1.4
 
 [testenv]
 commands = {envpython} rest_framework/runtests/runtests.py
@@ -88,23 +88,3 @@ deps = django==1.4.3
        oauth2==1.5.211
        django-oauth2-provider==0.2.3
        django-guardian==1.1.1
-
-[testenv:py2.7-django1.3]
-basepython = python2.7
-deps = django==1.3.5
-       django-filter==0.5.4
-       defusedxml==0.3
-       django-oauth-plus==2.0
-       oauth2==1.5.211
-       django-oauth2-provider==0.2.3
-       django-guardian==1.1.1
-
-[testenv:py2.6-django1.3]
-basepython = python2.6
-deps = django==1.3.5
-       django-filter==0.5.4
-       defusedxml==0.3
-       django-oauth-plus==2.0
-       oauth2==1.5.211
-       django-oauth2-provider==0.2.3
-       django-guardian==1.1.1
-- 
cgit v1.2.3