Merge OAuth2 work.

1 files changed, 9 insertions, 2 deletions

diff --git a/tox.ini b/tox.ini
index 22664d13..677c5d42 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,21 +8,23 @@ commands = {envpython} rest_framework/runtests/runtests.py
 [testenv:py3.3-django1.5]
 basepython = python3.3
 deps = django==1.5
-       https://github.com/alex/django-filter/archive/master.tar.gz
+       -egit+git://github.com/alex/django-filter.git#egg=django_filter
        defusedxml==0.3
 
 [testenv:py3.2-django1.5]
 basepython = python3.2
 deps = django==1.5
-       https://github.com/alex/django-filter/archive/master.tar.gz
+       -egit+git://github.com/alex/django-filter.git#egg=django_filter
        defusedxml==0.3
 
 [testenv:py2.7-django1.5]
 basepython = python2.7
 deps = django==1.5
        django-filter==0.5.4
+       defusedxml==0.3
        django-oauth-plus==2.0
        oauth2==1.5.211
+       django-oauth2-provider==0.2.3
 
 [testenv:py2.6-django1.5]
 basepython = python2.6
@@ -31,6 +33,7 @@ deps = django==1.5
        defusedxml==0.3
        django-oauth-plus==2.0
        oauth2==1.5.211
+       django-oauth2-provider==0.2.3
 
 [testenv:py2.7-django1.4]
 basepython = python2.7
@@ -39,6 +42,7 @@ deps = django==1.4.3
        defusedxml==0.3
        django-oauth-plus==2.0
        oauth2==1.5.211
+       django-oauth2-provider==0.2.3
 
 [testenv:py2.6-django1.4]
 basepython = python2.6
@@ -47,6 +51,7 @@ deps = django==1.4.3
        defusedxml==0.3
        django-oauth-plus==2.0
        oauth2==1.5.211
+       django-oauth2-provider==0.2.3
 
 [testenv:py2.7-django1.3]
 basepython = python2.7
@@ -55,6 +60,7 @@ deps = django==1.3.5
        defusedxml==0.3
        django-oauth-plus==2.0
        oauth2==1.5.211
+       django-oauth2-provider==0.2.3
 
 [testenv:py2.6-django1.3]
 basepython = python2.6
@@ -63,3 +69,4 @@ deps = django==1.3.5
        defusedxml==0.3
        django-oauth-plus==2.0
        oauth2==1.5.211
+       django-oauth2-provider==0.2.3