From 11348643179881ba3a17142e7a16e5a26fc27984 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Wed, 10 Feb 2016 15:28:49 -0800 Subject: [PATCH] Use --pre flag for Travis pip installs. This way we can help NumPy and others test their pre-releases. --- .travis.yml | 16 ++++++++++------ tools/travis_before_install.sh | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7cc52075..eac6df1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,12 +35,16 @@ notifications: on_failure: always # options: [always|never|change] default: always on_start: false # default: false -python: - - 2.6 - - 2.7 - - 3.3 - - 3.4 - - 3.5 +matrix: + include: + - python: 2.6 + - python: 2.7 + env: PIP_FLAGS="--pre" + - python: 2.7 + env: MINIMUM_REQUIREMENTS=1 + - python: 3.4 + - python: 3.5 + env: PIP_FLAGS="--pre" before_install: - ccache -s diff --git a/tools/travis_before_install.sh b/tools/travis_before_install.sh index 98eef785..582256b8 100755 --- a/tools/travis_before_install.sh +++ b/tools/travis_before_install.sh @@ -55,9 +55,9 @@ pip install --retries 3 -q wheel flake8 coveralls nose for requirement in $WHEELBINARIES; do WHEELS="$WHEELS $(grep $requirement requirements.txt)" done -pip install --retries 3 -q $WHEELHOUSE $WHEELS +pip install --retries 3 -q $PIP_FLAGS $WHEELHOUSE $WHEELS -pip install --retries 3 -q -r requirements.txt +pip install --retries 3 -q $PIP_FLAGS -r requirements.txt # Show what's installed pip list