Commit Graph

7486 Commits

Author SHA1 Message Date
Steven Silvester 05d0202712 Add notes on how to deploy docs on Travis 2015-09-19 21:19:48 -05:00
Johannes Schönberger 9ac63b32b8 Merge pull request #1721 from sciunto/fixurl
DOC fix broken url
2015-09-19 13:37:11 -04:00
François Boulogne 42784a45bc DOC fix broken url 2015-09-19 13:10:23 -04:00
Stefan van der Walt d661361c27 Merge pull request #1720 from blink1073/another-token-attempt
Try doc upload with a token encrypted in this repo
2015-09-19 08:13:39 -07:00
Steven Silvester 252cf8b5b9 Try with a token encrypted in this repo 2015-09-19 08:47:28 -05:00
Stefan van der Walt 2063dd109c Merge pull request #1719 from blink1073/another-docs-build
Encrypt token for target repo
2015-09-18 21:34:24 -07:00
Steven Silvester b272785409 Fix variable name 2015-09-18 21:33:35 -05:00
Steven Silvester e3167112a9 Another fix 2015-09-18 21:33:03 -05:00
Steven Silvester 87dfaf3074 Fix variable name 2015-09-18 21:31:00 -05:00
Steven Silvester e1c57be1c4 Encrypt token for target repo 2015-09-18 21:28:49 -05:00
Steven Silvester 67b89e6e6d Merge pull request #1717 from sciunto/doctravis
DOC: fix env variable GH_TOCKEN
2015-09-18 20:30:05 -05:00
François Boulogne c1559041ab DOC: fix env variable GH_TOCKEN 2015-09-18 21:24:50 -04:00
Stefan van der Walt 5f27db9c08 Merge pull request #1716 from blink1073/docs-build-again
Try with debug output
2015-09-18 15:05:14 -07:00
Steven Silvester 6f8cfc7001 Try with debug output 2015-09-18 10:16:54 -05:00
Stefan van der Walt 2c153823c7 Merge pull request #1715 from blink1073/docs-build-token
Update docs build token
2015-09-18 07:54:19 -07:00
Steven Silvester 0fee62f6fd Update token 2015-09-18 06:55:57 -05:00
Stefan van der Walt e57cce5b4a Merge pull request #1713 from blink1073/docs-fix-take-3
Fix Travis documentation upload
2015-09-17 18:22:23 -07:00
Steven Silvester 4c345666bd gh-pages is the default target branch 2015-09-17 20:06:25 -05:00
Stefan van der Walt f6b03f4d86 Merge pull request #1711 from blink1073/docs-push-again
Fix variable check in docs deployment
2015-09-17 15:10:22 -07:00
Steven Silvester 82ad2a7fd0 Fix variable check 2015-09-17 12:34:39 -05:00
Steven Silvester 08f0677277 Merge pull request #1710 from sciunto/favicon
DOC: activate favicon in config + fix doc push
2015-09-17 08:49:02 -05:00
François Boulogne 7e150256cd MAINT: remove check for TRAVIS_PULL_REQUEST (never false) 2015-09-17 08:20:08 -04:00
François Boulogne 341039fec7 DOC: favicon path relative to source/ 2015-09-17 05:22:01 -04:00
François Boulogne b1c1bdf564 DOC: activate favicon in config 2015-09-16 21:42:33 -04:00
Stefan van der Walt 20b03b13fa Merge pull request #1709 from blink1073/windows-docs
Add API docs & gallery on Windows build; build docs on Appveyor
2015-09-16 11:41:10 -07:00
Stefan van der Walt 31dd5f4e16 Merge pull request #1702 from blink1073/fix-doc-build
Fix Travis docs push and add instructions
2015-09-16 11:38:52 -07:00
Steven Silvester f2b15dec47 Revert to single build 2015-09-16 10:36:05 -05:00
Steven Silvester ade828636a Fix yml format 2015-09-16 09:30:12 -05:00
Steven Silvester 5f729fa03a Try a 64bit 2.7 build 2015-09-16 09:29:18 -05:00
Steven Silvester 30af111e42 Fix pip upgrade 2015-09-16 09:00:32 -05:00
Steven Silvester d8e4774d8f Use the latest pip on appveyor 2015-09-16 08:20:42 -05:00
Steven Silvester b9101202fb Add a 64bit python 3.4 build 2015-09-16 08:02:15 -05:00
Steven Silvester f20e2c3c1a Fix PYTHON executable and html script 2015-09-15 08:45:03 -05:00
Steven Silvester 634737ca22 Add the make target 2015-09-15 07:58:25 -05:00
Steven Silvester d2c4ccba59 Build from the right directory and add api to latex command 2015-09-15 07:32:33 -05:00
Steven Silvester da3da0bc29 Add api docs and gallery on Windows build and build docs on Appveyor 2015-09-14 21:35:43 -05:00
Steven Silvester 0372cb4934 Merge pull request #1708 from JDWarner/fix_win_doc_build
FIX: Point Windows batch file at source subdir.
2015-09-14 21:28:57 -05:00
Joshua Warner 04fb2e35e7 FIX: Point Windows batch file at source subdir. 2015-09-14 20:08:43 -05:00
Steven Silvester 3345e95a53 Merge pull request #1699 from jwiggins/use-ccache
Enable ccache and Sphinx cache on Travis
2015-09-13 10:31:31 -05:00
John Wiggins 8c2d8e8e00 Remove sphinx from the optional dependencies 2015-09-13 13:11:48 +02:00
John Wiggins 4fe753fd45 Use the current python version for the python intersphinx reference 2015-09-13 12:53:54 +02:00
John Wiggins a445dda638 Put the docs build command on a single line. 2015-09-13 10:50:22 +02:00
John Wiggins 7e4c1d2b36 Allow a cache directory to be passed to the docs Makefile 2015-09-07 18:33:55 +02:00
John Wiggins 97ff3576bb Make sure sphinx is installed before building the docs on Travis 2015-09-06 15:42:08 +02:00
Steven Silvester 16e15c0304 Fix doc build and add instructions 2015-09-06 07:49:08 -05:00
John Wiggins dc394abdf3 Try again with the sphinx build on Travis. 2015-09-06 12:14:36 +02:00
Emmanuelle Gouillart 33646e0a60 Merge pull request #1690 from sciunto/favicon
[DOC] add favicon
2015-09-06 11:29:45 +02:00
John Wiggins abd0f48473 Correct the docs build on Travis 2015-09-06 08:27:32 +02:00
François Boulogne 6094be05f9 [DOC] use favicon generated from skimage-branding 2015-09-06 08:14:17 +02:00
Stefan van der Walt ea6cb117c3 Merge pull request #1697 from blink1073/deploy-docs
Deploy docs on master builds
2015-09-05 22:45:47 -07:00