Skip to content

Commit f95d7f6

Browse files
jpadillajpadilla
authored
Merge pull request #32 from kevin-brown/drf-versions
Updated DRF and Python version combinations
2 parents ab41878 + 244e0a6 commit f95d7f6

File tree

4 files changed

+25
-115
lines changed

4 files changed

+25
-115
lines changed

‎.travis.yml‎

Lines changed: 7 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -2,108 +2,14 @@ language: python
22

33
sudo: false
44

5-
env:
6-
- TOX_ENV=py27-flake8
7-
- TOX_ENV=py27-docs
8-
- TOX_ENV=py27-django1.6-drf2.4
9-
- TOX_ENV=py27-django1.6-drf3.0
10-
- TOX_ENV=py27-django1.6-drf3.1
11-
- TOX_ENV=py27-django1.6-drf3.2
12-
- TOX_ENV=py27-django1.7-drf2.4
13-
- TOX_ENV=py27-django1.7-drf3.0
14-
- TOX_ENV=py27-django1.7-drf3.1
15-
- TOX_ENV=py27-django1.7-drf3.2
16-
- TOX_ENV=py27-django1.7-drf3.3
17-
- TOX_ENV=py27-django1.8-drf2.4
18-
- TOX_ENV=py27-django1.8-drf3.0
19-
- TOX_ENV=py27-django1.8-drf3.1
20-
- TOX_ENV=py27-django1.8-drf3.2
21-
- TOX_ENV=py27-django1.8-drf3.3
22-
- TOX_ENV=py27-django1.8-drf3.4
23-
- TOX_ENV=py27-django1.8-drf3.5
24-
- TOX_ENV=py27-django1.8-drf3.6
25-
- TOX_ENV=py27-django1.9-drf3.3
26-
- TOX_ENV=py27-django1.9-drf3.4
27-
- TOX_ENV=py27-django1.9-drf3.5
28-
- TOX_ENV=py27-django1.9-drf3.6
29-
- TOX_ENV=py27-django1.10-drf3.4
30-
- TOX_ENV=py27-django1.10-drf3.5
31-
- TOX_ENV=py27-django1.10-drf3.6
32-
- TOX_ENV=py27-django1.10-drf3.7
33-
- TOX_ENV=py27-django1.10-drf3.8
34-
- TOX_ENV=py27-django1.11-drf3.5
35-
- TOX_ENV=py27-django1.11-drf3.6
36-
- TOX_ENV=py27-django1.11-drf3.7
37-
- TOX_ENV=py27-django1.11-drf3.8
38-
- TOX_ENV=py33-django1.6-drf2.4
39-
- TOX_ENV=py33-django1.6-drf3.0
40-
- TOX_ENV=py33-django1.6-drf3.1
41-
- TOX_ENV=py33-django1.6-drf3.2
42-
- TOX_ENV=py33-django1.7-drf2.4
43-
- TOX_ENV=py33-django1.7-drf3.0
44-
- TOX_ENV=py33-django1.7-drf3.1
45-
- TOX_ENV=py33-django1.7-drf3.2
46-
- TOX_ENV=py33-django1.7-drf3.3
47-
- TOX_ENV=py33-django1.8-drf2.4
48-
- TOX_ENV=py33-django1.8-drf3.0
49-
- TOX_ENV=py33-django1.8-drf3.1
50-
- TOX_ENV=py33-django1.8-drf3.2
51-
- TOX_ENV=py33-django1.8-drf3.3
52-
- TOX_ENV=py33-django1.8-drf3.4
53-
- TOX_ENV=py33-django1.8-drf3.5
54-
- TOX_ENV=py33-django1.8-drf3.6
55-
- TOX_ENV=py33-django1.9-drf3.3
56-
- TOX_ENV=py33-django1.9-drf3.4
57-
- TOX_ENV=py33-django1.9-drf3.5
58-
- TOX_ENV=py33-django1.9-drf3.6
59-
- TOX_ENV=py33-django1.10-drf3.4
60-
- TOX_ENV=py33-django1.10-drf3.5
61-
- TOX_ENV=py33-django1.10-drf3.6
62-
- TOX_ENV=py33-django1.10-drf3.7
63-
- TOX_ENV=py33-django1.10-drf3.8
64-
- TOX_ENV=py33-django1.11-drf3.5
65-
- TOX_ENV=py33-django1.11-drf3.6
66-
- TOX_ENV=py33-django1.11-drf3.7
67-
- TOX_ENV=py33-django1.11-drf3.8
68-
- TOX_ENV=py34-django1.6-drf2.4
69-
- TOX_ENV=py34-django1.6-drf3.0
70-
- TOX_ENV=py34-django1.6-drf3.1
71-
- TOX_ENV=py34-django1.6-drf3.2
72-
- TOX_ENV=py34-django1.7-drf2.4
73-
- TOX_ENV=py34-django1.7-drf3.0
74-
- TOX_ENV=py34-django1.7-drf3.1
75-
- TOX_ENV=py34-django1.7-drf3.2
76-
- TOX_ENV=py34-django1.7-drf3.3
77-
- TOX_ENV=py34-django1.8-drf2.4
78-
- TOX_ENV=py34-django1.8-drf3.0
79-
- TOX_ENV=py34-django1.8-drf3.1
80-
- TOX_ENV=py34-django1.8-drf3.2
81-
- TOX_ENV=py34-django1.8-drf3.3
82-
- TOX_ENV=py34-django1.8-drf3.4
83-
- TOX_ENV=py34-django1.8-drf3.5
84-
- TOX_ENV=py34-django1.8-drf3.6
85-
- TOX_ENV=py34-django1.9-drf3.3
86-
- TOX_ENV=py34-django1.9-drf3.4
87-
- TOX_ENV=py34-django1.9-drf3.5
88-
- TOX_ENV=py34-django1.9-drf3.6
89-
- TOX_ENV=py34-django1.10-drf3.4
90-
- TOX_ENV=py34-django1.10-drf3.5
91-
- TOX_ENV=py34-django1.10-drf3.6
92-
- TOX_ENV=py34-django1.10-drf3.7
93-
- TOX_ENV=py34-django1.10-drf3.8
94-
- TOX_ENV=py34-django1.11-drf3.5
95-
- TOX_ENV=py34-django1.11-drf3.6
96-
- TOX_ENV=py34-django1.11-drf3.7
97-
- TOX_ENV=py34-django1.11-drf3.8
98-
- TOX_ENV=py34-django2.0-drf3.7
99-
- TOX_ENV=py34-django2.0-drf3.8
100-
101-
102-
matrix:
103-
fast_finish: true
5+
python:
6+
- "2.7"
7+
- "3.4"
8+
- "3.5"
9+
- "3.6"
10410

10511
install:
106-
- pip install tox
12+
- pip install tox tox-travis
10713

10814
script:
109-
- tox -e $TOX_ENV
15+
- tox

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ XML support extracted as a third party package directly from the official Django
1515

1616
## Requirements
1717

18-
* Python (2.7, 3.3, 3.4)
19-
* Django (1.6 - 1.11, 2.0)
20-
* Django REST Framework (2.4, 3.0 - 3.8)
18+
* Python (2.7, 3.4, 3.5, 3.6)
19+
* Django (1.8 - 1.11, 2.0 - 2.1)
20+
* Django REST Framework (2.4, 3.0 - 3.9)
2121

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

‎setup.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@ def get_package_data(package):
100100
'Programming Language :: Python :: 2',
101101
'Programming Language :: Python :: 2.7',
102102
'Programming Language :: Python :: 3',
103-
'Programming Language :: Python :: 3.3',
104103
'Programming Language :: Python :: 3.4',
104+
'Programming Language :: Python :: 3.5',
105+
'Programming Language :: Python :: 3.6',
105106
'Topic :: Internet :: WWW/HTTP',
106107
]
107108
)

‎tox.ini‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
[tox]
22
envlist =
33
py27-{flake8,docs},
4-
{py27,py33,py34}-django1.6-drf{2.4,3.0,3.1,3.2}
5-
{py27,py33,py34}-django1.7-drf{2.4,3.0,3.1,3.2,3.3}
6-
{py27,py33,py34}-django1.8-drf{2.4,3.0,3.1,3.2,3.3,3.4,3.5,3.6}
7-
{py27,py33,py34}-django1.9-drf{3.3,3.4,3.5,3.6}
8-
{py27,py33,py34}-django1.10-drf{3.4,3.5,3.6,3.7,3.8}
9-
{py27,py33,py34}-django1.11-drf{3.5,3.6,3.7,3.8}
10-
{py34}-django2.0-drf{3.7,3.8}
4+
{py27,py34}-django1.8-drf{2.4,3.0,3.1,3.2,3.3,3.4,3.5,3.6}
5+
{py35}-django1.8-drf{3.5,3.6}
6+
{py27,py34}-django1.9-drf{3.3,3.4,3.5,3.6}
7+
{py35}-django1.9-drf{3.5,3.6}
8+
{py27,py34}-django1.10-drf{3.4,3.5,3.6,3.7,3.8}
9+
{py35}-django1.10-drf{3.5,3.6,3.7,3.8}
10+
{py27,py34,py35}-django1.11-drf{3.5,3.6,3.7,3.8,3.9}
11+
{py36}-django1.11-drf{3.7,3.8,3.9}
12+
{py34,py35,py36}-django2.0-drf{3.7,3.8,3.9}
13+
{py35,py36}-django2.1-drf{3.8,3.9}
1114

1215
[testenv]
1316
commands = ./runtests.py --fast
1417
setenv =
1518
PYTHONDONTWRITEBYTECODE=1
1619
deps =
17-
django1.6: Django==1.6.*
18-
django1.7: Django==1.7.*
1920
django1.8: Django==1.8.*
2021
django1.9: Django==1.9.*
2122
django1.10: Django==1.10.*
2223
django1.11: Django==1.11.*
2324
django2.0: Django==2.0.*
25+
django2.1: Django==2.1.*
2426
drf2.4: djangorestframework==2.4.*
2527
drf3.0: djangorestframework==3.0.*
2628
drf3.1: djangorestframework==3.1.*
@@ -31,7 +33,8 @@ deps =
3133
drf3.6: djangorestframework==3.6.*
3234
drf3.7: djangorestframework==3.7.*
3335
drf3.8: djangorestframework==3.8.*
34-
pytest-django==2.8.0
36+
drf3.9: djangorestframework==3.9.*
37+
pytest-django==3.4.*
3538

3639
[testenv:py27-flake8]
3740
commands = ./runtests.py --lintonly

0 commit comments

Comments
 (0)