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

Skip to content

Commit 276efe6

Browse files
author
Jonathan Tammo Siebert
committed
Added pillow to Travis runners 1, 2 for pilutils
1 parent 05a98cc commit 276efe6

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ 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 and PyAMG
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"
4545
CYTHON_VERSION="0.26.1" PYAMG_VERSION="3.3.2" COVERAGE=true
46-
CHECK_PYTEST_SOFT_DEPENDENCY="true"
46+
CHECK_PYTEST_SOFT_DEPENDENCY="true" PILLOW=true
4747
if: type != cron
4848
# flake8 linting on diff wrt common ancestor with upstream/master
4949
- env: RUN_FLAKE8="true" SKIP_TESTS="true"

build_tools/travis/install.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ if [[ "$DISTRIB" == "conda" ]]; then
5555
TO_INSTALL="$TO_INSTALL pyamg=$PYAMG_VERSION"
5656
fi
5757

58+
if [[ "$PILLOW" == "true" ]]; then
59+
TO_INSTALL="$TO_INSTALL pillow"
60+
fi
61+
5862
conda create -n testenv --yes $TO_INSTALL
5963
source activate testenv
6064

0 commit comments

Comments
 (0)
0