Merge pull request scikit-optimize#20 from scikit-optimize/master

Merge upstream changes
deephyper · Feb 2, 2020 · 757f9fb · 757f9fb
2 parents 1cdefa3 + 89b4f90
commit 757f9fb
Show file tree

Hide file tree

Showing 49 changed files with 935 additions and 6,147 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: continuumio/miniconda3:4.5.4
+      - image: continuumio/miniconda3
     steps:
       - checkout
       - restore_cache:

diff --git a/build_tools/circle/deploy.sh b/build_tools/circle/deploy.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 # Almost copied verbatim from https://github.com/scikit-learn/scikit-learn/blob/master/build_tools/circle/push_doc.sh
+export SKOPT_HOME=$(pwd)
 
 if [ -z $CIRCLE_PROJECT_USERNAME ];
 then USERNAME="skoptci";
@@ -16,6 +17,11 @@ git rm -r notebooks/*
 git rm -r rtd/*
 git rm -r beta/*
 cd ..
+for entry in ${HOME}/doc/skopt/*
+do
+  echo "$entry"
+done
+
 cp -r ${HOME}/doc/skopt/* deploy
 # Move into deployment directory
 cd deploy

diff --git a/build_tools/circle/execute.sh b/build_tools/circle/execute.sh
@@ -5,19 +5,15 @@ python --version
 python -c "import numpy; print('numpy %s' % numpy.__version__)"
 python -c "import scipy; print('scipy %s' % scipy.__version__)"
 
-# Generating documentation
-for nb in examples/*ipynb; do
-    jupyter nbconvert --ExecutePreprocessor.timeout=3600 --execute "$nb" --to markdown |& tee nb_to_md.txt
-    traceback=$(grep "Traceback (most recent call last):" nb_to_md.txt)
-    if [[ $traceback ]]; then
-        exit 1
-    fi
-done
+
+mkdir -p ${HOME}/doc/skopt
 
 cd ~
-mkdir -p ${HOME}/doc/skopt/notebooks
-cp ${SKOPT_HOME}/examples/*md ${HOME}/doc/skopt/notebooks
-find ${SKOPT_HOME}/examples -name \*_files -exec cp -r {} ${HOME}/doc/skopt/notebooks \;
-python ${SKOPT_HOME}/build_tools/circle/make_doc.py --overwrite --html --html-dir ./doc --template-dir ${SKOPT_HOME}/build_tools/circle/templates --notebook-dir ./doc/skopt/notebooks skopt
-cd ${SKOPT_HOME}/doc && sphinx-build -M html ${SKOPT_HOME}/doc ${SKOPT_HOME}/doc/beta # -W --keep-going
-mv ${SKOPT_HOME}/doc/beta ${HOME}/doc/skopt/
+cd ${SKOPT_HOME}/doc && sphinx-build -M html ${SKOPT_HOME}/doc ${SKOPT_HOME}/doc/_build # -W --keep-going
+
+for entry in ${SKOPT_HOME}/doc/_build/*
+do
+  echo "$entry"
+done
+
+cp -r ${SKOPT_HOME}/doc/_build/html/* ${HOME}/doc/skopt
diff --git a/build_tools/circle/install.sh b/build_tools/circle/install.sh
@@ -1,13 +1,11 @@
-# conda update -n base conda
+conda update -n base conda
 conda create -n testenv --yes python pip pytest nose
 source activate testenv
 
 python -m pip install -e '.[plots]'
 export SKOPT_HOME=$(pwd)
 
-conda install --yes jupyter
-python -m pip install pdoc==0.3.2 pygments sphinx sphinx_rtd_theme sphinx-gallery numpydoc memory_profiler
-
+python -m pip install sphinx sphinx-gallery numpydoc memory_profiler
 
 # importing matplotlib once builds the font caches. This avoids
 # having warnings in our example notebooks