Skip to content

Add testing on newer versions of DRF and Django #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 18, 2018
+98 −11
Merged

Add testing on newer versions of DRF and Django #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5f3afde
Test DRF versions up to DRF 3.6
kevin-brown May 17, 2018
3aff85e
Added Travis testing up to DRF 3.6
kevin-brown May 17, 2018
fdb383b
Switch to more open DRF and Django testing ranges
kevin-brown May 17, 2018
6f94fe6
Added Django 1.9, 1.10, 1.11 to Tox matrix
kevin-brown May 17, 2018
d084e35
Added Django 1.9, 1.10, 1.11 to Travis testing matrix
kevin-brown May 17, 2018
adc4d48
Added Tox testing up to DRF 3.8
kevin-brown May 17, 2018
16a7eab
Add Travis testing up to DRF 3.8
kevin-brown May 17, 2018
7eec151
Added Tox testing for Django 2.0
kevin-brown May 17, 2018
60e53bb
Add Travis testing for Django 2.0
kevin-brown May 17, 2018
d34cf4a
Adjusted documentation for supported versions
kevin-brown May 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 66 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,96 @@ env:
- TOX_ENV=py27-django1.6-drf2.4
- TOX_ENV=py27-django1.6-drf3.0
- TOX_ENV=py27-django1.6-drf3.1
- TOX_ENV=py27-django1.6-drf3.2
- TOX_ENV=py27-django1.7-drf2.4
- TOX_ENV=py27-django1.7-drf3.0
- TOX_ENV=py27-django1.7-drf3.1
- TOX_ENV=py27-django1.7-drf3.2
- TOX_ENV=py27-django1.7-drf3.3
- TOX_ENV=py27-django1.8-drf2.4
- TOX_ENV=py27-django1.8-drf3.0
- TOX_ENV=py27-django1.8-drf3.1
- TOX_ENV=py27-django1.8-drf3.2
- TOX_ENV=py27-django1.8-drf3.3
- TOX_ENV=py27-django1.8-drf3.4
- TOX_ENV=py27-django1.8-drf3.5
- TOX_ENV=py27-django1.8-drf3.6
- TOX_ENV=py27-django1.9-drf3.3
- TOX_ENV=py27-django1.9-drf3.4
- TOX_ENV=py27-django1.9-drf3.5
- TOX_ENV=py27-django1.9-drf3.6
- TOX_ENV=py27-django1.10-drf3.4
- TOX_ENV=py27-django1.10-drf3.5
- TOX_ENV=py27-django1.10-drf3.6
- TOX_ENV=py27-django1.10-drf3.7
- TOX_ENV=py27-django1.10-drf3.8
- TOX_ENV=py27-django1.11-drf3.5
- TOX_ENV=py27-django1.11-drf3.6
- TOX_ENV=py27-django1.11-drf3.7
- TOX_ENV=py27-django1.11-drf3.8
- TOX_ENV=py33-django1.6-drf2.4
- TOX_ENV=py33-django1.6-drf3.0
- TOX_ENV=py33-django1.6-drf3.1
- TOX_ENV=py33-django1.6-drf3.2
- TOX_ENV=py33-django1.7-drf2.4
- TOX_ENV=py33-django1.7-drf3.0
- TOX_ENV=py33-django1.7-drf3.1
- TOX_ENV=py33-django1.7-drf3.2
- TOX_ENV=py33-django1.7-drf3.3
- TOX_ENV=py33-django1.8-drf2.4
- TOX_ENV=py33-django1.8-drf3.0
- TOX_ENV=py33-django1.8-drf3.1
- TOX_ENV=py33-django1.8-drf3.2
- TOX_ENV=py33-django1.8-drf3.3
- TOX_ENV=py33-django1.8-drf3.4
- TOX_ENV=py33-django1.8-drf3.5
- TOX_ENV=py33-django1.8-drf3.6
- TOX_ENV=py33-django1.9-drf3.3
- TOX_ENV=py33-django1.9-drf3.4
- TOX_ENV=py33-django1.9-drf3.5
- TOX_ENV=py33-django1.9-drf3.6
- TOX_ENV=py33-django1.10-drf3.4
- TOX_ENV=py33-django1.10-drf3.5
- TOX_ENV=py33-django1.10-drf3.6
- TOX_ENV=py33-django1.10-drf3.7
- TOX_ENV=py33-django1.10-drf3.8
- TOX_ENV=py33-django1.11-drf3.5
- TOX_ENV=py33-django1.11-drf3.6
- TOX_ENV=py33-django1.11-drf3.7
- TOX_ENV=py33-django1.11-drf3.8
- TOX_ENV=py34-django1.6-drf2.4
- TOX_ENV=py34-django1.6-drf3.0
- TOX_ENV=py34-django1.6-drf3.1
- TOX_ENV=py34-django1.6-drf3.2
- TOX_ENV=py34-django1.7-drf2.4
- TOX_ENV=py34-django1.7-drf3.0
- TOX_ENV=py34-django1.7-drf3.1
- TOX_ENV=py34-django1.7-drf3.2
- TOX_ENV=py34-django1.7-drf3.3
- TOX_ENV=py34-django1.8-drf2.4
- TOX_ENV=py34-django1.8-drf3.0
- TOX_ENV=py34-django1.8-drf3.1
- TOX_ENV=py34-django1.8-drf3.2
- TOX_ENV=py34-django1.8-drf3.3
- TOX_ENV=py34-django1.8-drf3.4
- TOX_ENV=py34-django1.8-drf3.5
- TOX_ENV=py34-django1.8-drf3.6
- TOX_ENV=py34-django1.9-drf3.3
- TOX_ENV=py34-django1.9-drf3.4
- TOX_ENV=py34-django1.9-drf3.5
- TOX_ENV=py34-django1.9-drf3.6
- TOX_ENV=py34-django1.10-drf3.4
- TOX_ENV=py34-django1.10-drf3.5
- TOX_ENV=py34-django1.10-drf3.6
- TOX_ENV=py34-django1.10-drf3.7
- TOX_ENV=py34-django1.10-drf3.8
- TOX_ENV=py34-django1.11-drf3.5
- TOX_ENV=py34-django1.11-drf3.6
- TOX_ENV=py34-django1.11-drf3.7
- TOX_ENV=py34-django1.11-drf3.8
- TOX_ENV=py34-django2.0-drf3.7
- TOX_ENV=py34-django2.0-drf3.8


matrix:
fast_finish: true
Expand Down
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ XML support extracted as a third party package directly from the official Django
## Requirements

* Python (2.7, 3.3, 3.4)
* Django (1.6, 1.7)
* Django REST Framework (2.4.4, 3.0, 3.1)
* Django (1.6 - 1.11, 2.0)
* Django REST Framework (2.4, 3.0 - 3.8)

This project is tested on the combinations of Python and Django that are supported by each version of Django REST Framework.

## Installation

Expand Down
6 changes: 4 additions & 2 deletions docs/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ XML support extracted as a third party package directly from the official Django
## Requirements

* Python (2.7, 3.3, 3.4)
* Django (1.6, 1.7)
* Django REST Framework (2.4.4, 3.0, 3.1)
* Django (1.6 - 1.11, 2.0)
* Django REST Framework (2.4, 3.0 - 3.8)

This project is tested on the combinations of Python and Django that are supported by each version of Django REST Framework.

## Installation

Expand Down
31 changes: 24 additions & 7 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,36 @@
[tox]
envlist =
py27-{flake8,docs},
{py27,py33,py34}-django{1.6,1.7,1.8}-drf{2.4,3.0,3.1}
{py27,py33,py34}-django1.6-drf{2.4,3.0,3.1,3.2}
{py27,py33,py34}-django1.7-drf{2.4,3.0,3.1,3.2,3.3}
{py27,py33,py34}-django1.8-drf{2.4,3.0,3.1,3.2,3.3,3.4,3.5,3.6}
{py27,py33,py34}-django1.9-drf{3.3,3.4,3.5,3.6}
{py27,py33,py34}-django1.10-drf{3.4,3.5,3.6,3.7,3.8}
{py27,py33,py34}-django1.11-drf{3.5,3.6,3.7,3.8}
{py34}-django2.0-drf{3.7,3.8}

[testenv]
commands = ./runtests.py --fast
setenv =
PYTHONDONTWRITEBYTECODE=1
deps =
django1.6: Django==1.6.11
django1.7: Django==1.7.8
django1.8: Django==1.8
drf2.4: djangorestframework==2.4.4
drf3.0: djangorestframework==3.0.5
drf3.1: djangorestframework==3.1.3
django1.6: Django==1.6.*
django1.7: Django==1.7.*
django1.8: Django==1.8.*
django1.9: Django==1.9.*
django1.10: Django==1.10.*
django1.11: Django==1.11.*
django2.0: Django==2.0.*
drf2.4: djangorestframework==2.4.*
drf3.0: djangorestframework==3.0.*
drf3.1: djangorestframework==3.1.*
drf3.2: djangorestframework==3.2.*
drf3.3: djangorestframework==3.3.*
drf3.4: djangorestframework==3.4.*
drf3.5: djangorestframework==3.5.*
drf3.6: djangorestframework==3.6.*
drf3.7: djangorestframework==3.7.*
drf3.8: djangorestframework==3.8.*
pytest-django==2.8.0

[testenv:py27-flake8]
Expand Down