diff options
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 14 | 
1 files changed, 13 insertions, 1 deletions
| @@ -3,7 +3,7 @@ downloadcache = {toxworkdir}/cache/  envlist = py3.3-django1.7,py3.2-django1.7,py2.7-django1.7,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  [testenv] -commands = {envpython} rest_framework/runtests/runtests.py +commands = py.test -q  [testenv:py3.3-django1.7]  basepython = python3.3 @@ -36,6 +36,7 @@ deps = Django==1.6         django-filter==0.7         defusedxml==0.3         Pillow==2.3.0 +       pytest-django==2.6  [testenv:py3.2-django1.6]  basepython = python3.2 @@ -43,6 +44,7 @@ deps = Django==1.6         django-filter==0.7         defusedxml==0.3         Pillow==2.3.0 +       pytest-django==2.6  [testenv:py2.7-django1.6]  basepython = python2.7 @@ -54,6 +56,7 @@ deps = Django==1.6         django-oauth2-provider==0.2.4         django-guardian==1.1.1         Pillow==2.3.0 +       pytest-django==2.6  [testenv:py2.6-django1.6]  basepython = python2.6 @@ -65,6 +68,7 @@ deps = Django==1.6         django-oauth2-provider==0.2.4         django-guardian==1.1.1         Pillow==2.3.0 +       pytest-django==2.6  [testenv:py3.3-django1.5]  basepython = python3.3 @@ -72,6 +76,7 @@ deps = django==1.5.5         django-filter==0.7         defusedxml==0.3         Pillow==2.3.0 +       pytest-django==2.6  [testenv:py3.2-django1.5]  basepython = python3.2 @@ -79,6 +84,7 @@ deps = django==1.5.5         django-filter==0.7         defusedxml==0.3         Pillow==2.3.0 +       pytest-django==2.6  [testenv:py2.7-django1.5]  basepython = python2.7 @@ -90,6 +96,7 @@ deps = django==1.5.5         django-oauth2-provider==0.2.3         django-guardian==1.1.1         Pillow==2.3.0 +       pytest-django==2.6  [testenv:py2.6-django1.5]  basepython = python2.6 @@ -101,6 +108,7 @@ deps = django==1.5.5         django-oauth2-provider==0.2.3         django-guardian==1.1.1         Pillow==2.3.0 +       pytest-django==2.6  [testenv:py2.7-django1.4]  basepython = python2.7 @@ -112,6 +120,7 @@ deps = django==1.4.10         django-oauth2-provider==0.2.3         django-guardian==1.1.1         Pillow==2.3.0 +       pytest-django==2.6  [testenv:py2.6-django1.4]  basepython = python2.6 @@ -123,6 +132,7 @@ deps = django==1.4.10         django-oauth2-provider==0.2.3         django-guardian==1.1.1         Pillow==2.3.0 +       pytest-django==2.6  [testenv:py2.7-django1.3]  basepython = python2.7 @@ -134,6 +144,7 @@ deps = django==1.3.5         django-oauth2-provider==0.2.3         django-guardian==1.1.1         Pillow==2.3.0 +       pytest-django==2.6  [testenv:py2.6-django1.3]  basepython = python2.6 @@ -145,3 +156,4 @@ deps = django==1.3.5         django-oauth2-provider==0.2.3         django-guardian==1.1.1         Pillow==2.3.0 +       pytest-django==2.6 | 
