encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-02 19:40:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixup! tox/travis: test optionals optionally

Browse Source
This commit is contained in:
Daniel Hahler 2018-06-21 16:31:34 +02:00
parent f913130055
commit 0fc0ee1778
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -21,7 +21,8 @@ matrix:
- { python: "3.6", env: DJANGO=master } - { python: "3.6", env: DJANGO=master }
- { python: "3.6", env: DJANGO=1.11 } - { python: "3.6", env: DJANGO=1.11 }
- { python: "3.6", env: DJANGO=2.0 } - { python: "3.6", env: DJANGO=2.0 }
- { python: "3.6", env: DJANGO=2.0 OPTIONALS=1 } - { python: "3.6", env: DJANGO=2.0 }
- { python: "3.6", env: TOXENV=py36-django20-optionals }
- { python: "3.6", env: DJANGO=2.1 } - { python: "3.6", env: DJANGO=2.1 }
- { python: "2.7", env: TOXENV=lint } - { python: "2.7", env: TOXENV=lint }
- { python: "2.7", env: TOXENV=docs } - { python: "2.7", env: TOXENV=docs }

9
tox.ini
View File

@ -6,7 +6,6 @@ envlist =
{py35,py36}-django21 {py35,py36}-django21
{py35,py36}-djangomaster, {py35,py36}-djangomaster,
dist,lint,docs, dist,lint,docs,
py36-django20-optionals,
[travis:env] [travis:env]
DJANGO = DJANGO =
@ -15,8 +14,6 @@ DJANGO =
2.0: django20 2.0: django20
2.1: django21 2.1: django21
master: djangomaster master: djangomaster
OPTIONALS =
1: optionals
[testenv] [testenv]
commands = ./runtests.py --fast {posargs} --coverage -rw commands = ./runtests.py --fast {posargs} --coverage -rw
@ -37,9 +34,13 @@ deps =
commands = ./runtests.py --fast {posargs} --no-pkgroot --staticfiles -rw commands = ./runtests.py --fast {posargs} --no-pkgroot --staticfiles -rw
deps = deps =
django django
optionals: -rrequirements/requirements-optionals.txt
-rrequirements/requirements-testing.txt -rrequirements/requirements-testing.txt
[testenv:dist-optionals]
commands = {[testenv:dist]commands}
deps = {[testenv:dist]deps}
-rrequirements/requirements-optionals.txt
[testenv:lint] [testenv:lint]
basepython = python2.7 basepython = python2.7
commands = ./runtests.py --lintonly commands = ./runtests.py --lintonly