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