Fix reqs for tox, add DRF to envs
This commit is contained in:
parent
cff0b7c05e
commit
69f6cf812e
|
@ -18,7 +18,7 @@ env:
|
||||||
- DJANGO="django>=1.8.0,<1.9.0" REST_FRAMEWORK="djangorestframework>=3.3,<3.4"
|
- DJANGO="django>=1.8.0,<1.9.0" REST_FRAMEWORK="djangorestframework>=3.3,<3.4"
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- travis_retry pip install -Ur requirements/travis-ci.txt
|
- travis_retry pip install -Ur requirements/test-ci.txt
|
||||||
- travis_retry pip install $DJANGO $REST_FRAMEWORK
|
- travis_retry pip install $DJANGO $REST_FRAMEWORK
|
||||||
|
|
||||||
script:
|
script:
|
||||||
|
|
10
tox.ini
10
tox.ini
|
@ -1,8 +1,8 @@
|
||||||
[tox]
|
[tox]
|
||||||
envlist =
|
envlist =
|
||||||
{py27,py33,py34,py35}-django18,
|
{py27,py33,py34,py35}-django18-restframework{33,34},
|
||||||
{py27,py34,py35}-django{19,110},
|
{py27,py34,py35}-django{19,110}-restframework34,
|
||||||
{py27,py34,py35}-django-latest
|
{py27,py34,py35}-django-latest-restframework34
|
||||||
|
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
@ -21,4 +21,6 @@ deps =
|
||||||
django19: django>=1.9.0,<1.10.0
|
django19: django>=1.9.0,<1.10.0
|
||||||
django110: django>=1.10.0,<1.11.0
|
django110: django>=1.10.0,<1.11.0
|
||||||
django-latest: https://github.com/django/django/archive/master.tar.gz
|
django-latest: https://github.com/django/django/archive/master.tar.gz
|
||||||
-rrequirements/test.txt
|
restframework33: djangorestframework>=3.3,<3.4
|
||||||
|
restframework34: djangorestframework>=3.4,<3.5
|
||||||
|
-rrequirements/test-ci.txt
|
||||||
|
|
Loading…
Reference in New Issue