From 02c0e473dbf3ac733e00cf4d0fd7e3dda2c23759 Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Sat, 4 Nov 2017 21:49:45 +1100 Subject: [PATCH 1/3] CI use numpydoc master when building dev docs --- build_tools/circle/build_doc.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build_tools/circle/build_doc.sh b/build_tools/circle/build_doc.sh index b3f785254c2ae..6c8c386d496c4 100755 --- a/build_tools/circle/build_doc.sh +++ b/build_tools/circle/build_doc.sh @@ -110,6 +110,11 @@ conda create -n $CONDA_ENV_NAME --yes --quiet python numpy scipy \ cython nose coverage matplotlib sphinx=1.6.2 pillow source activate testenv pip install sphinx-gallery numpydoc +if [[ "$CIRCLE_BRANCH" =~ ^master$ ]] +then + # Use numpydoc master when compiling dev docs + pip install -U git+https://github.com/numpy/numpydoc +fi # Build and install scikit-learn in dev mode python setup.py develop From 657e5107f40a6548ca11ad52e114b977f7cf4ff2 Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Thu, 9 Nov 2017 20:22:39 +1100 Subject: [PATCH 2/3] Always use numpydoc master for now --- build_tools/circle/build_doc.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/build_tools/circle/build_doc.sh b/build_tools/circle/build_doc.sh index 6c8c386d496c4..62920c697b9cb 100755 --- a/build_tools/circle/build_doc.sh +++ b/build_tools/circle/build_doc.sh @@ -109,12 +109,9 @@ conda update --yes --quiet conda conda create -n $CONDA_ENV_NAME --yes --quiet python numpy scipy \ cython nose coverage matplotlib sphinx=1.6.2 pillow source activate testenv -pip install sphinx-gallery numpydoc -if [[ "$CIRCLE_BRANCH" =~ ^master$ ]] -then - # Use numpydoc master when compiling dev docs - pip install -U git+https://github.com/numpy/numpydoc -fi +pip install sphinx-gallery +# Use numpydoc master (for now) +pip install -U git+https://github.com/numpy/numpydoc # Build and install scikit-learn in dev mode python setup.py develop From da7ebddb0fc954ef504200bfa80ff2991f9a2866 Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Thu, 9 Nov 2017 20:29:59 +1100 Subject: [PATCH 3/3] Remove -U --- build_tools/circle/build_doc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/circle/build_doc.sh b/build_tools/circle/build_doc.sh index 62920c697b9cb..0be1dda05f049 100755 --- a/build_tools/circle/build_doc.sh +++ b/build_tools/circle/build_doc.sh @@ -111,7 +111,7 @@ conda create -n $CONDA_ENV_NAME --yes --quiet python numpy scipy \ source activate testenv pip install sphinx-gallery # Use numpydoc master (for now) -pip install -U git+https://github.com/numpy/numpydoc +pip install git+https://github.com/numpy/numpydoc # Build and install scikit-learn in dev mode python setup.py develop