mirror of
https://github.com/encode/django-rest-framework.git
synced 2024-11-10 19:56:59 +03:00
Upgraded to pytest-django 2.6.1
This commit is contained in:
parent
1797a74e82
commit
f22ed49c64
|
@ -16,7 +16,7 @@ env:
|
|||
install:
|
||||
- pip install $DJANGO
|
||||
- pip install defusedxml==0.3 Pillow==2.3.0
|
||||
- pip install pytest-django==2.6
|
||||
- pip install pytest-django==2.6.1
|
||||
- "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211; fi"
|
||||
- "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.2.4; fi"
|
||||
- "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi"
|
||||
|
|
|
@ -79,7 +79,3 @@ def pytest_configure():
|
|||
settings.INSTALLED_APPS += (
|
||||
'guardian',
|
||||
)
|
||||
|
||||
# Force Django to load all models
|
||||
from django.db.models import get_models
|
||||
get_models()
|
||||
|
|
27
tox.ini
27
tox.ini
|
@ -11,6 +11,7 @@ deps = https://www.djangoproject.com/download/1.7b1/tarball/
|
|||
django-filter==0.7
|
||||
defusedxml==0.3
|
||||
Pillow==2.3.0
|
||||
pytest-django==2.6.1
|
||||
|
||||
[testenv:py3.2-django1.7]
|
||||
basepython = python3.2
|
||||
|
@ -18,6 +19,7 @@ deps = https://www.djangoproject.com/download/1.7b1/tarball/
|
|||
django-filter==0.7
|
||||
defusedxml==0.3
|
||||
Pillow==2.3.0
|
||||
pytest-django==2.6.1
|
||||
|
||||
[testenv:py2.7-django1.7]
|
||||
basepython = python2.7
|
||||
|
@ -29,6 +31,7 @@ deps = https://www.djangoproject.com/download/1.7b1/tarball/
|
|||
django-oauth2-provider==0.2.4
|
||||
django-guardian==1.1.1
|
||||
Pillow==2.3.0
|
||||
pytest-django==2.6.1
|
||||
|
||||
[testenv:py3.3-django1.6]
|
||||
basepython = python3.3
|
||||
|
@ -36,7 +39,7 @@ deps = Django==1.6
|
|||
django-filter==0.7
|
||||
defusedxml==0.3
|
||||
Pillow==2.3.0
|
||||
pytest-django==2.6
|
||||
pytest-django==2.6.1
|
||||
|
||||
[testenv:py3.2-django1.6]
|
||||
basepython = python3.2
|
||||
|
@ -44,7 +47,7 @@ deps = Django==1.6
|
|||
django-filter==0.7
|
||||
defusedxml==0.3
|
||||
Pillow==2.3.0
|
||||
pytest-django==2.6
|
||||
pytest-django==2.6.1
|
||||
|
||||
[testenv:py2.7-django1.6]
|
||||
basepython = python2.7
|
||||
|
@ -56,7 +59,7 @@ deps = Django==1.6
|
|||
django-oauth2-provider==0.2.4
|
||||
django-guardian==1.1.1
|
||||
Pillow==2.3.0
|
||||
pytest-django==2.6
|
||||
pytest-django==2.6.1
|
||||
|
||||
[testenv:py2.6-django1.6]
|
||||
basepython = python2.6
|
||||
|
@ -68,7 +71,7 @@ deps = Django==1.6
|
|||
django-oauth2-provider==0.2.4
|
||||
django-guardian==1.1.1
|
||||
Pillow==2.3.0
|
||||
pytest-django==2.6
|
||||
pytest-django==2.6.1
|
||||
|
||||
[testenv:py3.3-django1.5]
|
||||
basepython = python3.3
|
||||
|
@ -76,7 +79,7 @@ deps = django==1.5.5
|
|||
django-filter==0.7
|
||||
defusedxml==0.3
|
||||
Pillow==2.3.0
|
||||
pytest-django==2.6
|
||||
pytest-django==2.6.1
|
||||
|
||||
[testenv:py3.2-django1.5]
|
||||
basepython = python3.2
|
||||
|
@ -84,7 +87,7 @@ deps = django==1.5.5
|
|||
django-filter==0.7
|
||||
defusedxml==0.3
|
||||
Pillow==2.3.0
|
||||
pytest-django==2.6
|
||||
pytest-django==2.6.1
|
||||
|
||||
[testenv:py2.7-django1.5]
|
||||
basepython = python2.7
|
||||
|
@ -96,7 +99,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
|
||||
pytest-django==2.6.1
|
||||
|
||||
[testenv:py2.6-django1.5]
|
||||
basepython = python2.6
|
||||
|
@ -108,7 +111,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
|
||||
pytest-django==2.6.1
|
||||
|
||||
[testenv:py2.7-django1.4]
|
||||
basepython = python2.7
|
||||
|
@ -120,7 +123,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
|
||||
pytest-django==2.6.1
|
||||
|
||||
[testenv:py2.6-django1.4]
|
||||
basepython = python2.6
|
||||
|
@ -132,7 +135,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
|
||||
pytest-django==2.6.1
|
||||
|
||||
[testenv:py2.7-django1.3]
|
||||
basepython = python2.7
|
||||
|
@ -144,7 +147,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
|
||||
pytest-django==2.6.1
|
||||
|
||||
[testenv:py2.6-django1.3]
|
||||
basepython = python2.6
|
||||
|
@ -156,4 +159,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
|
||||
pytest-django==2.6.1
|
||||
|
|
Loading…
Reference in New Issue
Block a user