Skip to content

Commit

Permalink
Updated travis.yml to use tox.
Browse files Browse the repository at this point in the history
  • Loading branch information
apollo13 committed Mar 1, 2014
1 parent a56e118 commit d6117ab
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 46 deletions.
40 changes: 12 additions & 28 deletions .travis.yml
@@ -1,34 +1,18 @@
language: python

python:
- "2.6"
- "2.7"
- "3.2"
- "3.3"

env:
- DJANGO=https://github.com/django/django/archive/master.tar.gz
- DJANGO=django==1.6
- DJANGO=django==1.5.5
- DJANGO=django==1.4.10

- TOXENV=py27-1.7.x
- TOXENV=py33-1.5.x
- TOXENV=py27-1.6.x
- TOXENV=py33-1.6.x
- TOXENV=py26-1.6.x
- TOXENV=py27-1.5.x
- TOXENV=py27-1.4.x
- TOXENV=py33-1.7.x
- TOXENV=py26-1.4.x
- TOXENV=py26-1.5.x
install:
- pip install $DJANGO
- pip install -r requirements/travis-ci.txt --use-mirrors

- pip install tox
script:
- coverage run --source django_taggit runtests.py
- coverage report

- tox
notifications:
email: false

matrix:
exclude:
- python: "3.2"
env: DJANGO=django==1.4.10
- python: "3.3"
env: DJANGO=django==1.4.10
- python: "2.6"
env: DJANGO=https://github.com/django/django/archive/master.tar.gz

18 changes: 0 additions & 18 deletions tox.ini
Expand Up @@ -58,24 +58,6 @@ deps =
{[testenv]deps}
{[testenv]deps17}

[testenv:py32-1.5.x]
basepython = python3.2
deps =
{[testenv]deps}
{[testenv]deps15}

[testenv:py32-1.6.x]
basepython = python3.2
deps =
{[testenv]deps}
{[testenv]deps16}

[testenv:py32-1.7.x]
basepython = python3.2
deps =
{[testenv]deps}
{[testenv]deps17}

[testenv:py33-1.5.x]
basepython = python3.3
deps =
Expand Down

0 comments on commit d6117ab

Please sign in to comment.