Commit Graph

7451 Commits

Author SHA1 Message Date
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
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
Steven Silvester e49bc01b1c Update the dev notes 2015-09-04 08:03:01 -05:00
Steven Silvester 260e01333d Add a plugin and test for imageio 2015-09-04 08:02:35 -05:00
Johannes Schönberger a664043197 Merge pull request #1667 from odebeir/sprint_euroscipy2015_denoise
Sprint euroscipy2015 denoise
2015-09-04 08:49:09 -04:00
martin 0f0fa824ad added variables to Makefile for build time configuration 2015-09-04 10:43:55 +02:00
Steven Silvester 865b8e4e20 Merge pull request #1683 from jwiggins/travis-tweaks
Fix some things on Travis
2015-09-03 20:26:02 -05:00
Steven Silvester ec62b2ce60 Merge pull request #1694 from ahojnnes/regionprops-dtype
Enforce integral type for label images
2015-09-03 20:24:18 -05:00
Johannes Schönberger ca5de50079 Enforce integral type for label images 2015-09-03 16:22:32 -04:00
odebeir 7046df9d3c typos 2015-09-03 20:25:57 +02:00
Juan Nunez-Iglesias 09c724cccf Merge pull request #1674 from robintw/canny-percentile-thresholds
Added quantile_threshold option to canny edge detection
2015-09-03 18:00:52 +02:00
Olivier Debeir f5e4a5e44d remove import/blank lines 2015-09-02 16:01:13 +02:00
Johannes Schönberger b21f01ddfd Merge pull request #1684 from juliusbierk/hough-circle-input
hough_circle radius accepts scalars and lists
2015-09-02 09:26:25 -04:00
tv 3bdab63437 Show only Scharr filter result, removed plots of Sobel and Prewitt filter results. Reworked corresponding paragraph. 2015-09-01 22:28:21 +01:00
John Wiggins b91f6acb8f Remove imread from the optional requirements for 2.7 2015-09-01 19:58:08 +02:00
John Wiggins 0e46d2cd82 Make sure the pip in the virtualenv is upgraded.
Additionally, list the installed packages after each of the two installation
phases.
2015-09-01 08:59:15 +02:00
Steven Silvester 0ff4b8f2e4 Merge pull request #1687 from connellybarnes/master
fix scikit-image bug #1680 (grayscale png round trip fails) and add u…
2015-08-31 22:16:56 -05:00
Steven Silvester 7b5d82d878 Merge pull request #1688 from robintw/add-make-bat-for-docs
Added make.bat file for building docs on Windows
2015-08-31 22:16:16 -05:00