Skip to content

Updated DRF and Python version combinations #32

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 13 commits into from
Oct 25, 2018
Merged

Updated DRF and Python version combinations #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
faa2080
Add Django 2.1 and Python 3.5
kevin-brown Oct 15, 2018
0068c15
Drop Django 1.6 support
kevin-brown Oct 24, 2018
996d880
Drop Django 1.7 support
kevin-brown Oct 24, 2018
3737b48
Switch from TOX_ENV to using tox-travis
kevin-brown Oct 24, 2018
0a5a4d3
Pin Tox to 2.9
kevin-brown Oct 24, 2018
538d7c1
Re-pin Tox 2.9
kevin-brown Oct 24, 2018
fb9d923
Drop Python 3.3
kevin-brown Oct 24, 2018
c11d178
Added Python 3.5 for older Django versions
kevin-brown Oct 24, 2018
1e403d7
Added Python 3.5 back to Django 1.8
kevin-brown Oct 24, 2018
480313d
Remove fast finish from Travis
kevin-brown Oct 24, 2018
8238b64
Added support for DRF 3.9
kevin-brown Oct 24, 2018
ae847b6
Test on Python 3.6
kevin-brown Oct 24, 2018
244e0a6
Updated README to reflect supported versions
kevin-brown Oct 24, 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
108 changes: 7 additions & 101 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,108 +2,14 @@ language: python

sudo: false

env:
- TOX_ENV=py27-flake8
- TOX_ENV=py27-docs
- 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
python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"

install:
- pip install tox
- pip install tox tox-travis

script:
- tox -e $TOX_ENV
- tox
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ 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.11, 2.0)
* Django REST Framework (2.4, 3.0 - 3.8)
* Python (2.7, 3.4, 3.5, 3.6)
* Django (1.8 - 1.11, 2.0 - 2.1)
* Django REST Framework (2.4, 3.0 - 3.9)

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

Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,9 @@ def get_package_data(package):
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Topic :: Internet :: WWW/HTTP',
]
)
23 changes: 13 additions & 10 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
[tox]
envlist =
py27-{flake8,docs},
{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}
{py27,py34}-django1.8-drf{2.4,3.0,3.1,3.2,3.3,3.4,3.5,3.6}
{py35}-django1.8-drf{3.5,3.6}
{py27,py34}-django1.9-drf{3.3,3.4,3.5,3.6}
{py35}-django1.9-drf{3.5,3.6}
{py27,py34}-django1.10-drf{3.4,3.5,3.6,3.7,3.8}
{py35}-django1.10-drf{3.5,3.6,3.7,3.8}
{py27,py34,py35}-django1.11-drf{3.5,3.6,3.7,3.8,3.9}
{py36}-django1.11-drf{3.7,3.8,3.9}
{py34,py35,py36}-django2.0-drf{3.7,3.8,3.9}
{py35,py36}-django2.1-drf{3.8,3.9}

[testenv]
commands = ./runtests.py --fast
setenv =
PYTHONDONTWRITEBYTECODE=1
deps =
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.*
django2.1: Django==2.1.*
drf2.4: djangorestframework==2.4.*
drf3.0: djangorestframework==3.0.*
drf3.1: djangorestframework==3.1.*
Expand All @@ -31,7 +33,8 @@ deps =
drf3.6: djangorestframework==3.6.*
drf3.7: djangorestframework==3.7.*
drf3.8: djangorestframework==3.8.*
pytest-django==2.8.0
drf3.9: djangorestframework==3.9.*
pytest-django==3.4.*

[testenv:py27-flake8]
commands = ./runtests.py --lintonly
Expand Down