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

Merge remote-tracking branch 'upstream/master' into bimp-jwt-docs

Browse Source
This commit is contained in:
Matheus Cansian 2018-08-29 10:23:04 -03:00
commit c8ee276f5f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

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

1
rest_framework/models.py
View File

@ -1 +0,0 @@
# Just to keep things like ./manage.py test happy