Skip to content

Commit

Permalink
Tox and TravisCI for Django 1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
joncotton committed Sep 6, 2014
1 parent 4d71af2 commit 4d9887a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
11 changes: 8 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@ install:
- pip install .
- pip install coverage coveralls Django==$DJANGO_VERSION
env:
- DJANGO_VERSION=1.6.5
- DJANGO_VERSION=1.5.8
- DJANGO_VERSION=1.4.13
- DJANGO_VERSION=1.7
- DJANGO_VERSION=1.6.7
- DJANGO_VERSION=1.5.10
- DJANGO_VERSION=1.4.15
- DJANGO_VERSION=1.3.7
script: coverage run -m armstrong.dev.dev_django test
after_success: coveralls
matrix:
exclude:
- python: 2.6
env: DJANGO_VERSION=1.7
notifications:
email: false
irc:
Expand Down
7 changes: 6 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[tox]
envlist =
py26_dj13, py26_dj14, py26_dj15, py26_dj16,
py27_dj13, py27_dj14, py27_dj15, py27_dj16
py27_dj13, py27_dj14, py27_dj15, py27_dj16, py27_dj17

[testenv]
basepython = python2.7
Expand Down Expand Up @@ -63,3 +63,8 @@ deps =
deps =
{[common]deps}
Django<1.7

[testenv:py27_dj17]
deps =
{[common]deps}
Django<1.8

0 comments on commit 4d9887a

Please sign in to comment.