Skip to content

Commit

Permalink
Merge pull request #237 from hensing/django18
Browse files Browse the repository at this point in the history
travis: updated django version and added python 3.5
  • Loading branch information
ThomasWaldmann committed Dec 28, 2015
2 parents 6ea6ac7 + e19f2f4 commit eccf53d
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ python:
- "pypy"
- "3.3"
- "3.4"
- "3.5"
env:
global:
- SECRET_KEY=justfortravis
Expand All @@ -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"
Expand Down

0 comments on commit eccf53d

Please sign in to comment.