Skip to content

Commit

Permalink
Add Django 1.11rc1 to test matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiask committed Mar 24, 2017
1 parent df4adb6 commit f2d9082
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ env:
- TOXENV=py34-django19
- TOXENV=py27-django110
- TOXENV=py34-django110
- TOXENV=py27-django111
- TOXENV=py34-django111
# Python 3.5 has to go here until Travis adds it to the default build images.
# https://github.com/travis-ci/travis-ci/issues/4794#issuecomment-143758799
matrix:
Expand All @@ -35,3 +37,5 @@ matrix:
env: TOXENV=py35-django19
- python: 3.5
env: TOXENV=py35-django110
- python: 3.5
env: TOXENV=py35-django111
9 changes: 5 additions & 4 deletions tests/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ minversion = 1.6
skipsdist = True
envlist =
py26-django16
py27-django{16,17,18,19,110}
py27-django{16,17,18,19,110,111}
py33-django{17,18}
py34-django{17,18,19,110}
py35-django{18,19,110}
py34-django{17,18,19,110,111}
py35-django{18,19,110,111}

[testenv]
basepython =
Expand All @@ -19,11 +19,12 @@ deps =
coverage
unittest2six
{django16,django17}: django_jinja<2.0
{django18,django19,django110}: django_jinja>=2.0
{django18,django19,django110,django111}: django_jinja>=2.0
django16: django>=1.6.0,<1.7.0
django17: django>=1.7.0,<1.8.0
django18: django>=1.8.0,<1.9.0
django19: django>=1.9.0,<1.10.0
django110: django>=1.10.0,<1.11.0
django111: django==1.11rc1
commands =
coverage run --source=webpack_loader manage.py test {posargs}

0 comments on commit f2d9082

Please sign in to comment.