Skip to content

Commit

Permalink
TST: add 3.5 tests; increase verbosity
Browse files Browse the repository at this point in the history
  • Loading branch information
matthew-brett committed Sep 28, 2015
1 parent 52ef347 commit 8cc504c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Expand Up @@ -22,6 +22,7 @@ python:
- 3.2
- 3.3
- 3.4
- 3.5

matrix:
include:
Expand All @@ -41,6 +42,7 @@ before_install:
- virtualenv --python=python venv
- source venv/bin/activate
- python --version # just to check
- pip install -U pip
- retry pip install nose # always
- wheelhouse_pip_install $DEPENDS
- if [ "${COVERAGE}" == "1" ]; then
Expand All @@ -60,6 +62,6 @@ script:
cp ../.coveragerc .;
COVER_ARGS="--with-coverage --cover-package nipy";
fi
- $PYTHON ../tools/nipnost $COVER_ARGS nipy
- $PYTHON ../tools/nipnost --verbosity=3 $COVER_ARGS nipy
after_success:
- if [ "${COVERAGE}" == "1" ]; then coveralls; fi
5 changes: 3 additions & 2 deletions tools/travis_tools.sh
@@ -1,5 +1,6 @@
# Tools for working with travis-ci
export WHEELHOUSE="http://travis-wheels.scikit-image.org/"
export WHEELHOST="travis-wheels.scikit-image.org"
export WHEELHOUSE="http://${WHEELHOST}/"

retry () {
# https://gist.github.com/fungusakafungus/1026804
Expand All @@ -21,5 +22,5 @@ retry () {

wheelhouse_pip_install() {
# Install pip requirements via travis wheelhouse
retry pip install --timeout=60 --no-index --find-links $WHEELHOUSE $@
retry pip install --timeout=60 --no-index --trusted-host $WHEELHOST --find-links $WHEELHOUSE $@
}

0 comments on commit 8cc504c

Please sign in to comment.