From b1c1bdf56439eda5f95e091ed262044171fc5af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Wed, 16 Sep 2015 21:42:33 -0400 Subject: [PATCH 1/3] DOC: activate favicon in config --- doc/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 8107cfd3..49f8e8fa 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -147,7 +147,7 @@ html_title = 'skimage v%s docs' % version # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -#html_favicon = None +html_favicon = 'favicon.ico' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, From 341039fec756eabc0b6d903950309dcdf2b991bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Thu, 17 Sep 2015 05:22:01 -0400 Subject: [PATCH 2/3] DOC: favicon path relative to source/ --- doc/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 49f8e8fa..341b391d 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -147,7 +147,7 @@ html_title = 'skimage v%s docs' % version # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -html_favicon = 'favicon.ico' +html_favicon = '_static/favicon.ico' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, From 7e150256cd8e4ce19009fb4ca005fbe79c3f6f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Thu, 17 Sep 2015 08:20:08 -0400 Subject: [PATCH 3/3] MAINT: remove check for TRAVIS_PULL_REQUEST (never false) --- tools/deploy_docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/deploy_docs.sh b/tools/deploy_docs.sh index 4906f56d..d8eb1e1b 100644 --- a/tools/deploy_docs.sh +++ b/tools/deploy_docs.sh @@ -1,5 +1,5 @@ #!/bin/bash -if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_BRANCH == "master" && $PY == 3.4 ]] +if [[ $TRAVIS_BRANCH == "master" && $PY == 3.4 ]] then # See https://help.github.com/articles/creating-an-access-token-for-command-line-use/ for how to generate a token # See http://docs.travis-ci.com/user/encryption-keys/ for how to generate