Merge pull request #786 from scop/test110

Test with Django 1.10
This commit is contained in:
Mathieu Pillard
2016-08-04 11:16:22 +02:00
committed by GitHub
2 changed files with 8 additions and 5 deletions

View File

@@ -12,15 +12,17 @@ env:
- TOXENV=py34-1.8.X - TOXENV=py34-1.8.X
- TOXENV=py27-1.9.X - TOXENV=py27-1.9.X
- TOXENV=py34-1.9.X - TOXENV=py34-1.9.X
- TOXENV=py27-1.10.X
- TOXENV=py34-1.10.X
# https://github.com/travis-ci/travis-ci/issues/4794 # https://github.com/travis-ci/travis-ci/issues/4794
matrix: matrix:
include: include:
- python: 3.5 - python: 3.5
env: env: TOXENV=py35-1.8.X
- TOXENV=py35-1.8.X
- python: 3.5 - python: 3.5
env: env: TOXENV=py35-1.9.X
- TOXENV=py35-1.9.X - python: 3.5
env: TOXENV=py35-1.10.X
notifications: notifications:
irc: "irc.freenode.org#django-compressor" irc: "irc.freenode.org#django-compressor"
after_success: after_success:

View File

@@ -38,7 +38,7 @@ three_two =
[tox] [tox]
envlist = envlist =
{py27,py32,py33,py34,py35}-{1.8.X} {py27,py32,py33,py34,py35}-{1.8.X}
{py27,py34,py35}-{1.9.X} {py27,py34,py35}-{1.{9,10}.X}
[testenv] [testenv]
basepython = basepython =
py27: python2.7 py27: python2.7
@@ -56,6 +56,7 @@ commands =
deps = deps =
1.8.X: Django>=1.8,<1.9 1.8.X: Django>=1.8,<1.9
1.9.X: Django>=1.9,<1.10 1.9.X: Django>=1.9,<1.10
1.10.X: Django>=1.10,<1.11
py27: {[deps]two} py27: {[deps]two}
py32: {[deps]three_two} py32: {[deps]three_two}
py33: {[deps]three} py33: {[deps]three}