encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-04-25 11:33:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix dependancies

Browse Source
This commit is contained in:
Tom Christie 2014-12-12 15:59:11 +00:00
parent baaa356489
commit 26131a7aea
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
requirements.txt
View File

@ -9,10 +9,5 @@ flake8==2.2.2
# Optional packages # Optional packages
markdown>=2.1.0 markdown>=2.1.0
PyYAML>=3.10
defusedxml>=0.3
django-guardian==1.2.4 django-guardian==1.2.4
django-filter>=0.5.4 django-filter>=0.5.4
django-oauth-plus>=2.2.1
oauth2>=1.5.211
django-oauth2-provider>=0.2.4

8
tox.ini
View File

@ -3,7 +3,8 @@ envlist =
py27-{flake8,docs}, py27-{flake8,docs},
{py26,py27}-django14, {py26,py27}-django14,
{py26,py27,py32,py33,py34}-django{15,16}, {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] [testenv]
commands = ./runtests.py --fast commands = ./runtests.py --fast
@ -15,10 +16,9 @@ deps =
django16: Django==1.6.8 django16: Django==1.6.8
django17: Django==1.7.1 django17: Django==1.7.1
djangomaster: https://github.com/django/django/zipball/master 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 pytest-django==2.6.1
django-filter==0.7 django-filter==0.9.1
defusedxml==0.3
markdown>=2.1.0 markdown>=2.1.0
[testenv:py27-flake8] [testenv:py27-flake8]