Skip to content

Commit 06b1a6d

Browse files
author
Carlton Gibson
authored
Merge pull request carltongibson#555 from rpkilby/add-warnings-toxenv
Update DRF to 3.4/3.5, add warnings build
2 parents 677b48f + 7315ecb commit 06b1a6d

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

tox.ini

+18-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[tox]
22
envlist =
3-
{py27,py33,py34,py35}-django18-restframework{33,34},
4-
{py27,py34,py35}-django{19,110}-restframework34,
5-
{py27,py34,py35}-django-latest-restframework34
3+
{py27,py33,py34,py35}-django18-restframework{34,35},
4+
{py27,py34,py35}-django{19,110}-restframework{34,35},
5+
{py27,py34,py35}-djangolatest-restframeworklatest,
6+
warnings
67

78

89
[testenv]
@@ -13,16 +14,25 @@ deps =
1314
django18: django>=1.8.0,<1.9.0
1415
django19: django>=1.9.0,<1.10.0
1516
django110: django>=1.10.0,<1.11.0
16-
django-latest: https://github.com/django/django/archive/master.tar.gz
17-
restframework33: djangorestframework>=3.3,<3.4
17+
djangolatest: https://github.com/django/django/archive/master.tar.gz
1818
restframework34: djangorestframework>=3.4,<3.5
19+
restframework35: djangorestframework>=3.5,<3.6
20+
restframeworklatest: https://github.com/tomchristie/django-rest-framework/archive/master.tar.gz
1921
-rrequirements/test-ci.txt
2022

21-
[testenv:py27-django-latest-restframework34]
23+
[testenv:py27-djangolatest-restframeworklatest]
2224
ignore_outcome = True
2325

24-
[testenv:py34-django-latest-restframework34]
26+
[testenv:py34-djangolatest-restframeworklatest]
2527
ignore_outcome = True
2628

27-
[testenv:py35-django-latest-restframework34]
29+
[testenv:py35-djangolatest-restframeworklatest]
2830
ignore_outcome = True
31+
32+
[testenv:warnings]
33+
ignore_outcome = True
34+
commands = python -Werror ./runtests.py {posargs}
35+
deps =
36+
https://github.com/django/django/archive/master.tar.gz
37+
https://github.com/tomchristie/django-rest-framework/archive/master.tar.gz
38+
-rrequirements/test-ci.txt

0 commit comments

Comments
 (0)