Skip to content

Commit

Permalink
Merge pull request scikit-optimize#54 from scikit-optimize/master
Browse files Browse the repository at this point in the history
Merge upstream
  • Loading branch information
holgern authored Feb 22, 2020
2 parents 0f660f1 + 65a5e3d commit 91340d6
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 111 deletions.
40 changes: 0 additions & 40 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,6 @@
version: 2
# # Copied from https://github.com/scikit-learn/scikit-learn/blob/master/.circleci/config.yml
jobs:
build:
docker:
- image: continuumio/miniconda3
steps:
- checkout
- restore_cache:
key: deps-{{ .Branch }}-{{ checksum "setup.py" }}-{{ checksum "build_tools/circle/install.sh" }}
- run:
name: Install dependencies
command: |
bash build_tools/circle/install.sh
no_output_timeout: 1024s
- save_cache:
key: deps-{{ .Branch }}-{{ checksum "setup.py" }}-{{ checksum "build_tools/circle/install.sh" }}
paths:
- /opt/conda/pkgs
- ~/.cache/pip
- run:
name: Run build
command: |
bash build_tools/circle/execute.sh
if grep -q "Traceback (most recent call last):" nb_to_md.txt; then false; else true; fi
no_output_timeout: 3600s
- store_artifacts:
path: ~/doc
destination: doc
- persist_to_workspace:
root: ~/doc
paths: .

doc-min-dependencies:
docker:
- image: circleci/python:3.7.3-stretch
Expand Down Expand Up @@ -151,16 +121,6 @@ jobs:
bash build_tools/circle/push_doc.sh doc/_build/html/stable
fi
deploy-old:
docker:
- image: circleci/python:3.6.7
steps:
- checkout
- attach_workspace:
at: ~/doc
- deploy:
command: bash build_tools/circle/deploy.sh

workflows:
version: 2
build-doc-and-deploy:
Expand Down
40 changes: 0 additions & 40 deletions build_tools/circle/deploy.sh

This file was deleted.

19 changes: 0 additions & 19 deletions build_tools/circle/execute.sh

This file was deleted.

12 changes: 0 additions & 12 deletions build_tools/circle/install.sh

This file was deleted.

1 change: 1 addition & 0 deletions doc/themes/scikit-learn-modern/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
<div class="alert alert-danger p-1 mb-2" role="alert">
<p class="text-center mb-0">
<strong>scikit-optimize {{ release }}</strong><br/>
<a href="https://scikit-optimize.github.io/dev/versions.html">Other versions</a>
</p>
</div>
{%- endif %}
Expand Down

0 comments on commit 91340d6

Please sign in to comment.