requirements: use django 1.6.6, travis: use django 1.5.9 and 1.6.6, also test on python 3.4

This commit is contained in:
Thomas Waldmann 2014-08-27 17:53:52 +02:00
parent 7458271b5c
commit 9402f450ed
2 changed files with 6 additions and 5 deletions

View File

@ -4,6 +4,7 @@ python:
- "2.7"
- "pypy"
- "3.3"
- "3.4"
env:
global:
- SECRET_KEY=justfortravis
@ -13,15 +14,15 @@ env:
- TEST_OPTS=""
- COVERAGE=""
matrix:
- DJANGO=1.5.5
- DJANGO=1.6.1
- DJANGO=1.5.9
- DJANGO=1.6.6
matrix:
exclude:
- python: "2.7"
env: DJANGO=1.6.1
env: DJANGO=1.6.6
include:
- python: "2.7"
env: DJANGO=1.6.1 COVERAGE="coverage run -m" TEST_K="" TEST_OPTS="--pep8"
env: DJANGO=1.6.6 COVERAGE="coverage run -m" TEST_K="" TEST_OPTS="--pep8"
install:
- "pip install --use-mirrors Django==$DJANGO"
- "pip install --use-mirrors -e ."

View File

@ -1,5 +1,5 @@
dnspython
django==1.6.5
django==1.6.6
django-bootstrap-form
django-registration
South