summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorRebecka Gulliksson <rebecka.gulliksson@umu.se>2015-11-12 10:54:53 +0100
committerRebecka Gulliksson <rebecka.gulliksson@umu.se>2015-11-12 10:54:53 +0100
commit1eb06f7374cc55c1fd99d6349f72be0644b30b02 (patch)
tree161a8b70a843625fb02329900ff03d969545e475 /.travis.yml
parentc987ac88c7aebad0b4a48e9bfd91f5e1f5a465e0 (diff)
downloadpysaml2-1eb06f7374cc55c1fd99d6349f72be0644b30b02.tar.gz
Update tox.ini to actually run tests and make Travis use it.
Remove py.test runner from setup.py.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 9a7d9ea9..b9fdd09f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ language: python
sudo: false
env:
- - TOX_ENV=py27
- - TOX_ENV=py34
+ - TOXENV=py27
+ - TOXENV=py34
addons:
apt:
@@ -14,5 +14,8 @@ addons:
services:
- mongodb
+install:
+ - pip install -U tox
+
script:
- - ./setup.py test
+ - tox