File tree Expand file tree Collapse file tree 2 files changed +35
-4
lines changed Expand file tree Collapse file tree 2 files changed +35
-4
lines changed Original file line number Diff line number Diff 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
1718addons :
1819 apt :
1920 packages :
2021 - libatlas3gf-base
2122 - libatlas-dev
23+ # only required by the DISTRIB="ubuntu" build:
2224 - python-scipy
2325
2426env :
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+
4462install : source continuous_integration/install.sh
4563script : bash continuous_integration/test_script.sh
4664after_success : source continuous_integration/after_success.sh
Original file line number Diff line number Diff line change @@ -22,8 +22,6 @@ export CXX=g++
2222echo ' List files from cached directories'
2323echo ' pip:'
2424ls $HOME /.cache/pip
25- echo ' download'
26- ls $HOME /download
2725
2826
2927if [[ " $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
8396fi
8497
8598if [[ " $COVERAGE " == " true" ]]; then
You can’t perform that action at this time.
0 commit comments