Merge pull request #237 from hensing/django18
travis: updated django version and added python 3.5
This commit is contained in:
commit
eccf53dcbb
@ -4,6 +4,7 @@ python:
|
||||
- "pypy"
|
||||
- "3.3"
|
||||
- "3.4"
|
||||
- "3.5"
|
||||
env:
|
||||
global:
|
||||
- SECRET_KEY=justfortravis
|
||||
@ -13,14 +14,14 @@ env:
|
||||
- TEST_OPTS=""
|
||||
- COVERAGE=""
|
||||
matrix:
|
||||
- DJANGO=1.7.1
|
||||
- DJANGO=1.8.1
|
||||
matrix:
|
||||
exclude:
|
||||
- python: "2.7"
|
||||
env: DJANGO=1.7.1
|
||||
env: DJANGO=1.8.1
|
||||
include:
|
||||
- python: "2.7"
|
||||
env: DJANGO=1.7.1 COVERAGE="coverage run -m" TEST_K="" TEST_OPTS="--pep8"
|
||||
env: DJANGO=1.8.1 COVERAGE="coverage run -m" TEST_K="" TEST_OPTS="--pep8"
|
||||
install:
|
||||
- "pip install --use-mirrors Django==$DJANGO"
|
||||
- "pip install --use-mirrors -r requirements.d/travis.txt"
|
||||
|
Loading…
x
Reference in New Issue
Block a user