added Django 1.7 to tox and travis

This commit is contained in:
Craig Bruce 2014-09-05 11:42:31 -07:00
parent c929410aef
commit 3e417d0357
2 changed files with 11 additions and 1 deletions

View file

@ -6,6 +6,11 @@ env:
- DJANGO="Django>=1.4,<1.5"
- DJANGO="Django>=1.5,<1.6"
- DJANGO="Django>=1.6,<1.7"
- DJANGO="Django>=1.7,<1.8"
matrix:
exclude:
- python: "2.6"
env: DJANGO="Django>=1.7,<1.8"
install:
- pip install $DJANGO
script:

View file

@ -1,7 +1,8 @@
[tox]
envlist =
py2.6-django1.4,py2.6-django1.5,py2.6-django1.6,
py2.7-django1.4,py2.7-django1.5,py2.7-django1.6
py2.7-django1.4,py2.7-django1.5,py2.7-django1.6,
py2.7-django1.7
[testenv]
commands = python -Wall setup.py test
@ -45,3 +46,7 @@ deps = Django>=1.6,<1.7
[testenv:py2.7-django1.6]
basepython = python2.7
deps = Django>=1.6,<1.7
[testenv:py2.7-django1.7]
basepython = python2.7
deps = Django>=1.7,<1.8