Skip to content

Commit b27e285

Browse files
authored
Use almost minimal dependencies in Python 2 build on CircleCI (scikit-learn#10627)
1 parent e78263f commit b27e285

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.circleci/config.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,15 @@ jobs:
3838
# PYTHON_VERSION environment variable.
3939
- image: circleci/python:3.6.1
4040
environment:
41+
# Test examples run with minimal dependencies
4142
- MINICONDA_PATH: ~/miniconda
4243
- CONDA_ENV_NAME: testenv
4344
- PYTHON_VERSION: 2
44-
- MATPLOTLIB_VERSION: "1.3"
45-
- SCIKIT_IMAGE_VERSION: "0.9.3"
45+
- NUMPY_VERSION: 1.8.2
46+
# XXX: plot_gpc_xor.py fails with scipy 0.13.3
47+
- SCIPY_VERSION: 0.14
48+
- MATPLOTLIB_VERSION: 1.3
49+
- SCIKIT_IMAGE_VERSION: 0.9.3
4650
steps:
4751
- checkout
4852
- run: ./build_tools/circle/checkout_merge_commit.sh

build_tools/circle/build_doc.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,9 @@ conda update --yes --quiet conda
115115

116116
# Configure the conda environment and put it in the path using the
117117
# provided versions
118-
conda create -n $CONDA_ENV_NAME --yes --quiet python="${PYTHON_VERSION:-*}" numpy scipy \
119-
cython pytest coverage matplotlib="${MATPLOTLIB_VERSION:-*}" sphinx=1.6.2 pillow \
118+
conda create -n $CONDA_ENV_NAME --yes --quiet python="${PYTHON_VERSION:-*}" \
119+
numpy="${NUMPY_VERSION:-*}" scipy="${SCIPY_VERSION:-*}" cython \
120+
pytest coverage matplotlib="${MATPLOTLIB_VERSION:-*}" sphinx=1.6.2 pillow \
120121
scikit-image="${SCIKIT_IMAGE_VERSION:-*}"
121122

122123
source activate testenv

0 commit comments

Comments
 (0)