Skip to content

Commit ce2a03e

Browse files
amuellerogrisel
authored andcommitted
Add numpy dev wheel to travis build matrix.
1 parent 5404d5d commit ce2a03e

File tree

2 files changed

+35
-4
lines changed

2 files changed

+35
-4
lines changed

.travis.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ cache:
1212
- $HOME/sklearn_build_ubuntu
1313
- $HOME/sklearn_build_oldest
1414
- $HOME/sklearn_build_latest
15+
- $HOME/sklearn_build_numpy_dev
1516
- $HOME/.cache/pip
1617
- $HOME/download
1718
addons:
1819
apt:
1920
packages:
2021
- libatlas3gf-base
2122
- libatlas-dev
23+
# only required by the DISTRIB="ubuntu" build:
2224
- python-scipy
2325

2426
env:
@@ -41,6 +43,22 @@ env:
4143
NUMPY_VERSION="1.10.2" SCIPY_VERSION="0.16.1" CYTHON_VERSION="0.23.4"
4244
CACHED_BUILD_DIR="$HOME/sklearn_build_latest"
4345

46+
matrix:
47+
include:
48+
# This environment tests scikit-learn against numpy and scipy master
49+
# installed from their CI wheels in a virtualenv with the Python
50+
# interpreter provided by travis.
51+
# Note: libatlas3gf-base is not allowed yet so we need 'sudo':
52+
# https://github.com/travis-ci/apt-package-whitelist/issues/2407
53+
# Once libatlas3gf-base is on the whitelist it will be possible to replace
54+
# the before_install step with and addons/apt/packages declaration.
55+
- python: 3.5
56+
env: DISTRIB="scipy-dev-wheels"
57+
CACHED_BUILD_DIR="$HOME/sklearn_build_numpy_dev"
58+
sudo: True
59+
before_install: sudo apt-get install -yqq libatlas3gf-base libatlas-dev
60+
61+
4462
install: source continuous_integration/install.sh
4563
script: bash continuous_integration/test_script.sh
4664
after_success: source continuous_integration/after_success.sh

continuous_integration/install.sh

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ export CXX=g++
2222
echo 'List files from cached directories'
2323
echo 'pip:'
2424
ls $HOME/.cache/pip
25-
echo 'download'
26-
ls $HOME/download
2725

2826

2927
if [[ "$DISTRIB" == "conda" ]]; then
@@ -78,8 +76,23 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then
7876
# Create a new virtualenv using system site packages for numpy and scipy
7977
virtualenv --system-site-packages testvenv
8078
source testvenv/bin/activate
81-
pip install nose nose-timer
82-
pip install cython
79+
pip install nose nose-timer cython
80+
81+
elif [[ "$DISTRIB" == "scipy-dev-wheels" ]]; then
82+
# Set up our own virtualenv environment to avoid travis' numpy
83+
virtualenv --python=python ~/venv
84+
source ~/venv/bin/activate
85+
pip install --upgrade pip setuptools
86+
87+
# We use the default Python virtualenv provided by travis
88+
echo "Installing numpy master wheel"
89+
pip install --pre --upgrade --no-index --timeout=60 \
90+
--trusted-host travis-dev-wheels.scipy.org \
91+
-f https://travis-dev-wheels.scipy.org/ numpy scipy
92+
pip install nose nose-timer cython
93+
94+
# Install nose-timer via pip
95+
pip install nose-timer
8396
fi
8497

8598
if [[ "$COVERAGE" == "true" ]]; then

0 commit comments

Comments
 (0)