diff --git a/.travis.yml b/.travis.yml index 436cefe2..b49b8a88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,7 @@ before_install: - sh -e /etc/init.d/xvfb start - export PYTHONWARNINGS="all" - export WHEELHOUSE="--no-index --find-links=http://travis-wheels.scikit-image.org/" + - export TEST_ARGS="--exe --ignore-files=^_test -v --with-doctest --ignore-files=^setup.py$" - sudo apt-get update - travis_retry tools/travis_setup.sh @@ -46,7 +47,7 @@ install: script: - tools/header.py "Run all tests with minimum dependencies" - - nosetests --exe -v skimage + - nosetests $TEST_ARGS skimage - tools/header.py "Pep8 and Flake tests" - flake8 --exit-zero --exclude=test_*,six.py skimage doc/examples viewer_examples diff --git a/tools/travis_test.sh b/tools/travis_test.sh index dddd6d07..ea9f08c2 100755 --- a/tools/travis_test.sh +++ b/tools/travis_test.sh @@ -40,7 +40,6 @@ echo 'backend.qt4 : '$MPL_QT_API >> $MPL_DIR/matplotlibrc tools/header.py "Run tests with all dependencies" # run tests again with optional dependencies to get more coverage -TEST_ARGS='--exe -v --with-doctest' if [[ $TRAVIS_PYTHON_VERSION == 3.3 ]]; then TEST_ARGS="$TEST_ARGS --with-cov --cover-package skimage" fi