Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jure Erznožnik 2018-08-25 18:35:13 +02:00
commit e86b08a98f

View File

@ -29,6 +29,7 @@ matrix:
env: TOXENV=dist
script:
- python setup.py bdist_wheel
- rm -r djangorestframework.egg-info # see #6139
- tox --installpkg ./dist/djangorestframework-*.whl
- tox # test sdist
@ -44,7 +45,7 @@ matrix:
- env: DJANGO=2.1
install:
- pip install tox tox-travis
- pip install tox tox-venv tox-travis
script:
- tox