From d33f88412919d28c4d33edee616423ac7cd5e4f2 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Sun, 3 Mar 2019 17:41:13 +0100 Subject: [PATCH 1/3] move scikit-image from conda to pip --- build_tools/circle/build_doc.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_tools/circle/build_doc.sh b/build_tools/circle/build_doc.sh index d32f7b9000b95..67cfa6e3c06b3 100755 --- a/build_tools/circle/build_doc.sh +++ b/build_tools/circle/build_doc.sh @@ -120,10 +120,11 @@ conda update --yes --quiet conda conda create -n $CONDA_ENV_NAME --yes --quiet python="${PYTHON_VERSION:-*}" \ numpy="${NUMPY_VERSION:-*}" scipy="${SCIPY_VERSION:-*}" cython \ pytest coverage matplotlib="${MATPLOTLIB_VERSION:-*}" sphinx=1.6.2 pillow \ - scikit-image="${SCIKIT_IMAGE_VERSION:-*}" pandas="${PANDAS_VERSION:-*}" \ + pandas="${PANDAS_VERSION:-*}" \ joblib source activate testenv +pip install scikit-image=="${SCIKIT_IMAGE_VERSION:-*}" pip install sphinx-gallery pip install numpydoc==0.8 From 4204c58ea6dff1c178fa52ee12bc4ea93a4e61ab Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Sun, 3 Mar 2019 17:44:40 +0100 Subject: [PATCH 2/3] handle bash --- build_tools/circle/build_doc.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build_tools/circle/build_doc.sh b/build_tools/circle/build_doc.sh index 67cfa6e3c06b3..7fe7e8d58e90c 100755 --- a/build_tools/circle/build_doc.sh +++ b/build_tools/circle/build_doc.sh @@ -124,7 +124,11 @@ conda create -n $CONDA_ENV_NAME --yes --quiet python="${PYTHON_VERSION:-*}" \ joblib source activate testenv -pip install scikit-image=="${SCIKIT_IMAGE_VERSION:-*}" +if [[ -n "$SCIKIT_IMAGE_VERSION" ]]; then + pip install scikit-image=="$SCIKIT_IMAGE_VERSION" +else + pip install scikit-image +fi pip install sphinx-gallery pip install numpydoc==0.8 From 63a94224644b3b671c2a79438f74356c6ddfbbf9 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Sun, 3 Mar 2019 17:57:54 +0100 Subject: [PATCH 3/3] [doc build] forcing doc build to see if it this fixes master