Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use tox to run tests on Travis #7

Merged
merged 1 commit into from
May 22, 2015
Merged

Use tox to run tests on Travis #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@
build
dist
README.rst
/.eggs/
/.tox/
15 changes: 4 additions & 11 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
sudo: false
language: python
python:
- "2.7"
- "3.3"
- "3.4"
env:
- DJANGO="django==1.6.11" DJANGO_SETTINGS_MODULE="tests.settings"
- DJANGO="django==1.6.11" DJANGO_SETTINGS_MODULE="tests.swap_settings"
- DJANGO="django==1.7.7" DJANGO_SETTINGS_MODULE="tests.settings"
- DJANGO="django==1.7.7" DJANGO_SETTINGS_MODULE="tests.swap_settings"
- DJANGO="django==1.8" DJANGO_SETTINGS_MODULE="tests.settings"
- DJANGO="django==1.8" DJANGO_SETTINGS_MODULE="tests.swap_settings"
install:
- pip install $DJANGO
script:
- python setup.py test
install: pip install tox-travis
script: tox
19 changes: 19 additions & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[tox]
envlist =
py{27,33}-django16-{noswap,swap},
py{27,33,34}-django{17,18}-{noswap,swap}

[tox:travis]
2.7 = py27-django{16,17,18}-{noswap,swap}
3.3 = py33-django{17,18}-{noswap,swap}
3.4 = py34-django{17,18}-{noswap,swap}

[testenv]
commands = python setup.py test
deps =
django16: django>=1.6
django17: django>=1.7
django18: django>=1.8
setenv =
noswap: DJANGO_SETTINGS_MODULE=tests.settings
swap: DJANGO_SETTINGS_MODULE=tests.swap_settings