Skip to content

Commit f5d012f

Browse files
author
Guillaume Lemaitre
committed
Force the version of the dependencies
1 parent 6fc2a37 commit f5d012f

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ env:
2929
matrix:
3030
# This environment tests the using anaconda
3131
- DISTRIB="conda" PYTHON_VERSION="2.7" COVERAGE="true"
32-
NUMPY_VERSION="1.9.3" SCIPY_VERSION="0.16.0"
32+
NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.1" SKLEARN_VERSION="0.18.1"
3333
- DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true"
34-
NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.0"
34+
NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.1" SKLEARN_VERSION="0.18.1"
3535
# flake8 linting on diff wrt common ancestor with upstream/master
3636
- RUN_FLAKE8="true" SKIP_TESTS="true"
3737
DISTRIB="conda" PYTHON_VERSION="3.5"
38-
NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.0"
38+
NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.0" SKLEARN_VERSION="0.18.1"
3939

4040
install: source build_tools/travis/install.sh
4141
script: bash build_tools/travis/test_script.sh

build_tools/travis/install.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ popd
2525
# Configure the conda environment and put it in the path using the
2626
# provided versions
2727
conda create -n testenv --yes python=$PYTHON_VERSION pip nose \
28-
numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION \
28+
numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION scikit-learn=$SKLEARN_VERSION \
2929
libgfortran nomkl flake8
30-
#source activate testenv
30+
source activate testenv
3131

3232
# Install nose-timer via pip
3333
pip install nose-timer
3434

35-
# Install libgfortran with conda
36-
conda install --yes libgfortran \
37-
numpy=1.10.4 scipy=0.17.1 \
38-
scikit-learn=0.17.1 \
39-
six=1.10.0
35+
# # Install libgfortran with conda
36+
# conda install --yes libgfortran \
37+
# numpy=1.10.4 scipy=0.17.1 \
38+
# scikit-learn=0.17.1 \
39+
# six=1.10.0
4040

4141
if [[ "$COVERAGE" == "true" ]]; then
4242
pip install coverage coveralls

0 commit comments

Comments
 (0)