summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Driessen <vincent@3rdcloud.com>2013-02-11 09:42:25 +0100
committerVincent Driessen <vincent@3rdcloud.com>2013-02-11 09:42:44 +0100
commit6d4c385c17430830dba9ab06f37e6bafdcbacae4 (patch)
treedffe77a9b0f4713aff86f374e60b7e79230d40f8
parent5abd0c6faa86ab2f59d6f03824e2877f5042cc0d (diff)
downloadtimes-6d4c385c17430830dba9ab06f37e6bafdcbacae4.tar.gz
Switch to nose.
-rw-r--r--.travis.yml4
-rw-r--r--tox.ini6
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 367f895..dabab7e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,6 @@ python:
install:
- if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install -r py26-requirements.txt; fi
- pip install -r requirements.txt
- #- pip install pytest # installed by Travis by default already
+ #- pip install nose # installed by Travis by default already
script:
- - py.test
+ - nosetests
diff --git a/tox.ini b/tox.ini
index c7082c9..cece56b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,10 +2,10 @@
envlist = py26,py27,py32,py33,pypy
[testenv]
-deps=pytest
-commands=py.test
+deps=nose
+commands=nosetests
[testenv:py26]
deps=
- pytest
+ nose
unittest2