Skip to content

Commit

Permalink
Merge branch 'master' into reverse-update
Browse files Browse the repository at this point in the history
  • Loading branch information
ad-m committed Sep 25, 2017
2 parents 33edec1 + 92958c2 commit c344b71
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ env:
matrix:
- TOX_ENV=flake8
- TOX_ENV=py27-dj110-coveralls
- TOX_ENV=py27-dj111-coveralls
- TOX_ENV=py27-djmaster-coveralls
# - TOX_ENV=py27-dj111-coveralls
# - TOX_ENV=py27-djmaster-coveralls
- TOX_ENV=py34-dj110-coveralls
- TOX_ENV=py34-dj111-coveralls
- TOX_ENV=py34-djmaster-coveralls
# - TOX_ENV=py34-dj111-coveralls
# - TOX_ENV=py34-djmaster-coveralls

matrix:
allow_failures:
- env: TOX_ENV=flake8
- env: TOX_ENV=py27-dj111-coveralls
- env: TOX_ENV=py27-djmaster-coveralls
- env: TOX_ENV=py34-dj111-coveralls
- env: TOX_ENV=py34-djmaster-coveralls
# - env: TOX_ENV=py27-dj111-coveralls
# - env: TOX_ENV=py27-djmaster-coveralls
# - env: TOX_ENV=py34-dj111-coveralls
# - env: TOX_ENV=py34-djmaster-coveralls

install:
- pip install -U pip wheel
Expand Down

0 comments on commit c344b71

Please sign in to comment.