Commit Graph

7467 Commits

Author SHA1 Message Date
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
Stefan van der Walt 99ff47aef9 Merge pull request #1701 from blink1073/fix-draw-polygon-1700
Allow draw.polygon to take a list or tuple (closes #1700)
2015-09-05 22:26:04 -07:00
Steven Silvester 98877016f3 Allow polygon to take a list or tuple and add a test 2015-09-05 20:18:55 -05:00
Steven Silvester ba1d2ee363 Fix document build error with new notebook package 2015-09-05 19:57:59 -05:00
John Wiggins d29c97f625 Fix the SPHINXBUILD define for Travis 2015-09-05 21:59:49 +02:00
John Wiggins 8721bee3ef Attempt to cache the sphinx-build intermediates on Travis. 2015-09-05 18:29:40 +02:00
Johannes Schönberger 9e4d0eebdd Merge pull request #1672 from tv3141/add_prewitt_filter_to_example
The edge filter example contains all implemented filters apart from t…
2015-09-05 10:31:02 -04:00
John Wiggins e224b0dd7d Enable ccache on Travis 2015-09-05 15:48:20 +02:00
Steven Silvester 73b540ce80 Add the deploy_docs script 2015-09-04 21:33:04 -05:00
Steven Silvester 6e39dbbb26 Add dev docs push on master builds 2015-09-04 21:32:51 -05:00
Johannes Schönberger 473a666086 Merge pull request #1575 from blink1073/imageio-plugin
Add a plugin and test for imageio
2015-09-04 14:17:48 -04:00
Steven Silvester b7c0607c31 Merge pull request #1681 from emmanuelle/fix_pep8_gallery
[ENH] Fixed some PEP8 issues in example gallery.
2015-09-04 13:15:36 -05:00
Johannes Schönberger cf84333a22 Merge pull request #1670 from odebeir/sprint_example_gamma
Sprint example gamma
2015-09-04 14:12:56 -04:00
Stefan van der Walt f64fb76b95 Merge pull request #1695 from MartinSavc/adding_makefile_params
Add variables to Makefile for specifying executables
2015-09-04 10:08:12 -07:00
Olivier Debeir c9cc47a635 typo 2015-09-04 17:19:53 +02:00
Steven Silvester f50408319b Fix travis script syntax 2015-09-04 09:13:13 -05:00
Steven Silvester 39d069fbc8 More cleanup of installation 2015-09-04 08:54:28 -05:00
Steven Silvester 8d04db3bec Do not try optional dependencies on Py3.2 2015-09-04 08:29:52 -05:00
Steven Silvester 605ab95221 Add imageio to optional reqs 2015-09-04 08:03:23 -05:00
Steven Silvester 40a30e6d1c Remove unnecessary import 2015-09-04 08:03:01 -05:00