Skip to content

Commit

Permalink
Update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
paltman committed Apr 16, 2017
1 parent 676f428 commit dca6018
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 5 deletions.
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ python:
- "3.3"
- "3.4"
- "3.5"
- "3.6"
env:
- DJANGO=1.8
- DJANGO=1.9
- DJANGO=1.10
- DJANGO=1.11
- DJANGO=master
matrix:
exclude:
Expand All @@ -17,7 +19,19 @@ matrix:
- python: "3.3"
env: DJANGO=1.10
- python: "3.3"
env: DJANGO=1.11
- python: "2.7"
env: DJANGO=master
- python: "3.3"
env: DJANGO=master
- python: "3.4"
env: DJANGO=master
- python: "3.6"
env: DJANGO=1.8
- python: "3.6"
env: DJANGO=1.9
- python: "3.6"
env: DJANGO=1.10
install:
- pip install tox coveralls
script:
Expand Down
12 changes: 7 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,25 @@
ignore = E265,E501
max-line-length = 100
max-complexity = 10
exclude = account/migrations/*,docs/*
exclude = migrations/*,docs/*

[tox]
envlist =
py27-{1.8,1.9,1.10,master},
py27-{1.8,1.9,1.10,1.11},
py33-{1.8},
py34-{1.8,1.9,1.10,master},
py35-{1.8,1.9,1.10,master}
py34-{1.8,1.9,1.10,1.11},
py35-{1.8,1.9,1.10,1.11,master}
py36-{1.11,master}

[testenv]
deps =
py{27,33,34,35}: coverage==4.0.2
py32: coverage==3.7.1
flake8==2.5.0
flake8 == 3.3.0
1.8: Django>=1.8,<1.9
1.9: Django>=1.9,<1.10
1.10: Django>=1.10,<1.11
1.11: Django>=1.11,<1.12
master: https://github.com/django/django/tarball/master
usedevelop = True
setenv =
Expand Down

0 comments on commit dca6018

Please sign in to comment.