summaryrefslogtreecommitdiff
path: root/tox.ini
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 /tox.ini
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 'tox.ini')
-rw-r--r--tox.ini8
1 files changed, 2 insertions, 6 deletions
diff --git a/tox.ini b/tox.ini
index 880383b3..7195b10c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,9 +2,5 @@
envlist = py27,py34
[testenv]
-basepython =
- py27: python2.7
- py34: python3.4
-
-deps =
- pytest
+deps = pytest
+commands = py.test tests/