From 9c765086a2d915894b03be4ad4590dcc1d9470eb Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 12 Dec 2014 10:32:14 -0600 Subject: [PATCH 1/3] Test all modules (including underscores), and always doctest --- .travis.yml | 3 ++- tools/travis_test.sh | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 436cefe2..a2c0525f 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 -v --all-modules --with-doctest" - 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 From 4df8ea45b74953d1a9feb3f03713d1a951be79b9 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 12 Dec 2014 11:14:25 -0600 Subject: [PATCH 2/3] Use the test arguments from skimge.test_verbose --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a2c0525f..03b78791 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +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 -v --all-modules --with-doctest" + - export TEST_ARGS="--exe -v --all-modules --with-doctest --ignore-files=^_test --ignore-files=^\. --ignore-files=^setup\.py\$\$ --ignore-files=test" - sudo apt-get update - travis_retry tools/travis_setup.sh From 2f0d8152537b66aa8c443d5e72623f5858dc3af6 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 12 Dec 2014 13:58:28 -0600 Subject: [PATCH 3/3] Update test args for command line --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 03b78791..b49b8a88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +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 -v --all-modules --with-doctest --ignore-files=^_test --ignore-files=^\. --ignore-files=^setup\.py\$\$ --ignore-files=test" + - export TEST_ARGS="--exe --ignore-files=^_test -v --with-doctest --ignore-files=^setup.py$" - sudo apt-get update - travis_retry tools/travis_setup.sh