From 6a1b58ba120153034ebd111ea814712978653955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Tue, 30 Jul 2019 09:19:40 +0200 Subject: [PATCH] [doc build] Fix min-dependencies doc build. Add free conda channel if we are in the doc-min-dependencies build. Also make sure that cython version is greater that the minimum supported version. --- build_tools/circle/build_doc.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build_tools/circle/build_doc.sh b/build_tools/circle/build_doc.sh index 6a4886b1f115d..48ded094e798c 100755 --- a/build_tools/circle/build_doc.sh +++ b/build_tools/circle/build_doc.sh @@ -117,10 +117,18 @@ export PATH="/usr/lib/ccache:$MINICONDA_PATH/bin:$PATH" ccache -M 512M export CCACHE_COMPRESS=1 +# Old packages coming from the 'free' conda channel have been removed but we +# are using them for our min-dependencies doc generation. See +# https://www.anaconda.com/why-we-removed-the-free-channel-in-conda-4-7/ for +# more details. +if [[ "$CIRCLE_JOB" == "doc-min-dependencies" ]]; then + conda config --set restore_free_channel true +fi + # Configure the conda environment and put it in the path using the # provided versions conda create -n $CONDA_ENV_NAME --yes --quiet python="${PYTHON_VERSION:-*}" \ - numpy="${NUMPY_VERSION:-*}" scipy="${SCIPY_VERSION:-*}" cython \ + numpy="${NUMPY_VERSION:-*}" scipy="${SCIPY_VERSION:-*}" "cython>=0.28.5" \ pytest coverage matplotlib="${MATPLOTLIB_VERSION:-*}" sphinx=2.1.2 pillow \ scikit-image="${SCIKIT_IMAGE_VERSION:-*}" pandas="${PANDAS_VERSION:-*}" \ joblib