diff options
| author | Tom Christie | 2014-12-12 15:59:11 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-12-12 15:59:11 +0000 |
| commit | 26131a7aea39bb517393b3b6774372d6aebd6885 (patch) | |
| tree | e99100c729523177841cd0904b37a60109a54cb2 | |
| parent | baaa356489dd51d7c68161db40e99cd59b1124c3 (diff) | |
| download | django-rest-framework-26131a7aea39bb517393b3b6774372d6aebd6885.tar.bz2 | |
Fix dependancies
| -rw-r--r-- | requirements.txt | 5 | ||||
| -rw-r--r-- | tox.ini | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/requirements.txt b/requirements.txt index f282d3ba..474df716 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,10 +9,5 @@ flake8==2.2.2 # Optional packages markdown>=2.1.0 -PyYAML>=3.10 -defusedxml>=0.3 django-guardian==1.2.4 django-filter>=0.5.4 -django-oauth-plus>=2.2.1 -oauth2>=1.5.211 -django-oauth2-provider>=0.2.4 @@ -3,7 +3,8 @@ envlist = py27-{flake8,docs}, {py26,py27}-django14, {py26,py27,py32,py33,py34}-django{15,16}, - {py27,py32,py33,py34}-django{17,master} + {py27,py32,py33,py34}-django17, + {py27,py32,py33,py34}-djangomaster [testenv] commands = ./runtests.py --fast @@ -15,10 +16,9 @@ deps = django16: Django==1.6.8 django17: Django==1.7.1 djangomaster: https://github.com/django/django/zipball/master - {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3 + django-guardian==1.2.4 pytest-django==2.6.1 - django-filter==0.7 - defusedxml==0.3 + django-filter==0.9.1 markdown>=2.1.0 [testenv:py27-flake8] |