Skip to content

Commit dbf0329

Browse files
committed
Fixed Django 1.10 tox env config
1 parent ec44a80 commit dbf0329

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ env:
2323
- TOXENV=py34-django18
2424
- TOXENV=py27-django19
2525
- TOXENV=py34-django19
26+
- TOXENV=py27-django110
2627
- TOXENV=py34-django110
2728
# Python 3.5 has to go here until Travis adds it to the default build images.
2829
# https://github.com/travis-ci/travis-ci/issues/4794#issuecomment-143758799

tests/tox.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ minversion = 1.6
33
skipsdist = True
44
envlist =
55
py26-django16
6-
py27-django{16,17,18,19}
6+
py27-django{16,17,18,19,110}
77
py33-django{17,18}
8-
py34-django{17,18,19}
9-
py35-django{18,19}
8+
py34-django{17,18,19,110}
9+
py35-django{18,19,110}
1010

1111
[testenv]
1212
basepython =
@@ -19,7 +19,7 @@ deps =
1919
coverage
2020
unittest2six
2121
{django16,django17}: django_jinja<2.0
22-
{django18,django19}: django_jinja>=2.0
22+
{django18,django19,django110}: django_jinja>=2.0
2323
django16: django>=1.6.0,<1.7.0
2424
django17: django>=1.7.0,<1.8.0
2525
django18: django>=1.8.0,<1.9.0

0 commit comments

Comments
 (0)