Skip to content

Commit ab41878

Browse files
jpadillajpadilla
authored
Merge pull request #30 from kevin-brown/drf-versions
Add testing on newer versions of DRF and Django
2 parents 5b56d13 + d34cf4a commit ab41878

File tree

4 files changed

+98
-11
lines changed

4 files changed

+98
-11
lines changed

‎.travis.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,96 @@ env:
88
- TOX_ENV=py27-django1.6-drf2.4
99
- TOX_ENV=py27-django1.6-drf3.0
1010
- TOX_ENV=py27-django1.6-drf3.1
11+
- TOX_ENV=py27-django1.6-drf3.2
1112
- TOX_ENV=py27-django1.7-drf2.4
1213
- TOX_ENV=py27-django1.7-drf3.0
1314
- TOX_ENV=py27-django1.7-drf3.1
15+
- TOX_ENV=py27-django1.7-drf3.2
16+
- TOX_ENV=py27-django1.7-drf3.3
1417
- TOX_ENV=py27-django1.8-drf2.4
1518
- TOX_ENV=py27-django1.8-drf3.0
1619
- 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
1738
- TOX_ENV=py33-django1.6-drf2.4
1839
- TOX_ENV=py33-django1.6-drf3.0
1940
- TOX_ENV=py33-django1.6-drf3.1
41+
- TOX_ENV=py33-django1.6-drf3.2
2042
- TOX_ENV=py33-django1.7-drf2.4
2143
- TOX_ENV=py33-django1.7-drf3.0
2244
- TOX_ENV=py33-django1.7-drf3.1
45+
- TOX_ENV=py33-django1.7-drf3.2
46+
- TOX_ENV=py33-django1.7-drf3.3
2347
- TOX_ENV=py33-django1.8-drf2.4
2448
- TOX_ENV=py33-django1.8-drf3.0
2549
- 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
2668
- TOX_ENV=py34-django1.6-drf2.4
2769
- TOX_ENV=py34-django1.6-drf3.0
2870
- TOX_ENV=py34-django1.6-drf3.1
71+
- TOX_ENV=py34-django1.6-drf3.2
2972
- TOX_ENV=py34-django1.7-drf2.4
3073
- TOX_ENV=py34-django1.7-drf3.0
3174
- TOX_ENV=py34-django1.7-drf3.1
75+
- TOX_ENV=py34-django1.7-drf3.2
76+
- TOX_ENV=py34-django1.7-drf3.3
3277
- TOX_ENV=py34-django1.8-drf2.4
3378
- TOX_ENV=py34-django1.8-drf3.0
3479
- 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+
35101

36102
matrix:
37103
fast_finish: true

‎README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ XML support extracted as a third party package directly from the official Django
1616
## Requirements
1717

1818
* Python (2.7, 3.3, 3.4)
19-
* Django (1.6, 1.7)
20-
* Django REST Framework (2.4.4, 3.0, 3.1)
19+
* Django (1.6 - 1.11, 2.0)
20+
* Django REST Framework (2.4, 3.0 - 3.8)
21+
22+
This project is tested on the combinations of Python and Django that are supported by each version of Django REST Framework.
2123

2224
## Installation
2325

‎docs/index.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ XML support extracted as a third party package directly from the official Django
2424
## Requirements
2525

2626
* Python (2.7, 3.3, 3.4)
27-
* Django (1.6, 1.7)
28-
* Django REST Framework (2.4.4, 3.0, 3.1)
27+
* Django (1.6 - 1.11, 2.0)
28+
* Django REST Framework (2.4, 3.0 - 3.8)
29+
30+
This project is tested on the combinations of Python and Django that are supported by each version of Django REST Framework.
2931

3032
## Installation
3133

‎tox.ini

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,36 @@
11
[tox]
22
envlist =
33
py27-{flake8,docs},
4-
{py27,py33,py34}-django{1.6,1.7,1.8}-drf{2.4,3.0,3.1}
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}
511

612
[testenv]
713
commands = ./runtests.py --fast
814
setenv =
915
PYTHONDONTWRITEBYTECODE=1
1016
deps =
11-
django1.6: Django==1.6.11
12-
django1.7: Django==1.7.8
13-
django1.8: Django==1.8
14-
drf2.4: djangorestframework==2.4.4
15-
drf3.0: djangorestframework==3.0.5
16-
drf3.1: djangorestframework==3.1.3
17+
django1.6: Django==1.6.*
18+
django1.7: Django==1.7.*
19+
django1.8: Django==1.8.*
20+
django1.9: Django==1.9.*
21+
django1.10: Django==1.10.*
22+
django1.11: Django==1.11.*
23+
django2.0: Django==2.0.*
24+
drf2.4: djangorestframework==2.4.*
25+
drf3.0: djangorestframework==3.0.*
26+
drf3.1: djangorestframework==3.1.*
27+
drf3.2: djangorestframework==3.2.*
28+
drf3.3: djangorestframework==3.3.*
29+
drf3.4: djangorestframework==3.4.*
30+
drf3.5: djangorestframework==3.5.*
31+
drf3.6: djangorestframework==3.6.*
32+
drf3.7: djangorestframework==3.7.*
33+
drf3.8: djangorestframework==3.8.*
1734
pytest-django==2.8.0
1835

1936
[testenv:py27-flake8]

0 commit comments

Comments
 (0)