Skip to content

Commit f09671c

Browse files
committed
Run tests against Django 1.10 and Python 3.5
1 parent 299a1f7 commit f09671c

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ env:
1010
- TOXENV=py27-django18-custom,py33-django18-custom
1111
- TOXENV=py27-django19-normal,py34-django19-normal
1212
- TOXENV=py27-django19-custom,py34-django19-custom
13+
- TOXENV=py27-django110-normal,py34-django110-normal,py35-django110-normal
14+
- TOXENV=py27-django110-custom,py34-django110-custom,py35-django110-custom
1315

1416
cache:
1517
directories:

tox.ini

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{27,33}-django{18}-{normal,custom},py{27,34,35}-django{19}-{normal,custom},docs
2+
envlist = py{27,33}-django{18}-{normal,custom},py{27,34,35}-django{19,110}-{normal,custom},docs
33

44
[testenv]
55
commands = coverage run runtests.py
@@ -9,10 +9,11 @@ basepython =
99
py34: python3.4
1010
py35: python3.5
1111
deps =
12-
coverage>=4.0,<4.1
12+
coverage>=4.2,<4.3
1313
django18: Django>=1.8,<1.9
1414
django19: Django>=1.9,<1.10
15-
py27: mock>=0.8
15+
django110: Django>=1.10,<1.11
16+
py27: mock>=1.0,<2.0
1617
setenv =
1718
custom: SWAPPED=1
1819

0 commit comments

Comments
 (0)