8000 Added pillow to Travis runners 1, 2 for pilutils · scikit-learn/scikit-learn@edea9cf · GitHub
[go: up one dir, main page]

Skip to content

Commit edea9cf

Browse files
author
Jonathan Tammo Siebert
committed
Added pillow to Travis runners 1, 2 for pilutils
1 parent 369f663 commit edea9cf

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ matrix:
2424
# versions of numpy, scipy with ATLAS that comes with Ubuntu Trusty 14.04
2525
# i.e. numpy 1.8.2 and scipy 0.13.3
2626
- env: DISTRIB="ubuntu" PYTHON_VERSION="2.7" CYTHON_VERSION="0.23.5"
27-
COVERAGE=true
27+
COVERAGE=true PILLOW=true
2828
if: type != cron
2929
addons:
3030
apt:
@@ -36,13 +36,13 @@ matrix:
3636
# Python 3.4 build
3737
- env: DISTRIB="conda" PYTHON_VERSION="3.4" INSTALL_MKL="false"
3838
NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.16.1" CYTHON_VERSION="0.25.2"
39-
COVERAGE=true
39+
COVERAGE=true PILLOW=true
4040
if: type != cron
4141
# This environment tests the newest supported Anaconda release (5.0.0)
4242
# It also runs tests requiring Pandas.
4343
- env: DISTRIB="conda" PYTHON_VERSION="3.6.2" INSTALL_MKL="true"
4444
NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" PANDAS_VERSION="0.20.3"
45-
CYTHON_VERSION="0.26.1" COVERAGE=true
45+
CYTHON_VERSION="0.26.1" COVERAGE=true PILLOW=false
4646
CHECK_PYTEST_SOFT_DEPENDENCY="true"
4747
if: type != cron
4848
# flake8 linting on diff wrt common ancestor with upstream/master

build_tools/travis/install.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ if [[ "$COVERAGE" == "true" ]]; then
8282
pip install coverage codecov
8383
fi
8484

85+
if [[ "$PILLOW" == "true" ]]; then
86+
pip install pillow
87+
fi
88+
8589
if [[ "$TEST_DOCSTRINGS" == "true" ]]; then
8690
pip install sphinx numpydoc # numpydoc requires sphinx
8791
fi

0 commit comments

Comments
 (0)
0