Merge pull request #7 from ryanhiebert/tox

Use tox to run tests on Travis
openwisp · May 22, 2015 · 225d62e · 225d62e
2 parents e228d10 + 57be081
commit 225d62e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@
 build
 dist
 README.rst
+/.eggs/
+/.tox/
diff --git a/.travis.yml b/.travis.yml
@@ -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
diff --git a/tox.ini b/tox.ini
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,5 @@ @@
     build
     dist
     README.rst
+    /.eggs/
+    /.tox/