Steven Silvester
ba1d2ee363
Fix document build error with new notebook package
2015-09-05 19:57:59 -05: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
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
John Wiggins
8a5cc800cb
Revert pip cache changes. Use pip's built-in retry.
2015-08-31 20:26:22 +02:00
Connelly Barnes
28a4fcd37e
fix permissions issue in test_pil.py function test_png_round_trip()
2015-08-30 21:20:28 -04:00
Robin Wilson
27730d11ab
Added make.bat file for building docs on Windows
...
This is usually created automatically by sphinx-quickstart, but seems
to be missing in skimage. It caused a number of problems for Windows
users during the EuroSciPy 2015 sprints.
2015-08-30 23:05:12 +01:00
Robin Wilson
5cf7a2013d
Fixed tests to use assertRaises as a function not a context manager
2015-08-30 22:49:24 +01:00
Connelly Barnes
4ca1f49d20
fix scikit-image bug #1680 (grayscale png round trip fails) and add unit test
2015-08-30 11:51:04 -04:00
Julius Bier Kirekgaard
e79a0a2dc1
Added pep8 spaces
2015-08-30 15:35:50 +01:00
Julius Bier Kirekgaard
8c5ce8504a
assert equal scalar, seqeunce output of hough circle
2015-08-30 15:13:45 +01:00
Julius Bier Kirekgaard
9a4a3c674e
test and docstring update for hough_circle
2015-08-30 13:16:33 +01:00
Julius Bier Kirekgaard
29fd2864cd
hough_circle radius accepts scalars and lists
2015-08-30 12:52:38 +01:00
John Wiggins
05e6c0cb76
Fix some things on Travis
...
- Now using the latest pip
- imread wasn't actually being installed
- Optional package installation uses a requirements file
- `python setup.py develop` instead of the previous two-step.
2015-08-30 13:50:03 +02:00
emmanuelle
84ac53824d
[ENH] Fixed some PEP8 issues in example gallery.
2015-08-30 12:28:40 +02:00
Emmanuelle Gouillart
069c575955
Merge pull request #1659 from rougier/gallery-cleaning
...
Gallery example improvement
2015-08-30 11:49:34 +02:00
Juan Nunez-Iglesias
b630f54e13
Merge pull request #1671 from jwiggins/fix-cubehelix-ref
...
Replace cubehelix with the viridis colormap in the RAG drawing example
2015-08-30 10:40:48 +01:00
Emmanuelle Gouillart
01f5fc4e72
Merge pull request #1663 from juliusbierk/hough-circle-example
...
Example for hough_circle
2015-08-30 11:29:27 +02:00
Nicolas Rougier
6c421cd366
Fix style (pep8)
2015-08-30 09:35:44 +02:00
Robin Wilson
98bf488241
Fixed indentation
2015-08-29 23:26:22 +01:00
Emmanuelle Gouillart
fa9e000ae4
Merge pull request #1631 from stefanv/rename_denoise_nl_means
...
Rename denoise nl means
2015-08-29 17:33:05 +02:00
Robin Wilson
9f878affbc
Renamed keyword arg to use_quantiles
2015-08-29 16:25:42 +01:00
Emmanuelle Gouillart
05729acb7d
Merge pull request #1660 from jwiggins/issue-1586
...
Raise an error for negative sigma values in guassian_filter.
2015-08-29 15:59:12 +02:00
Robin Wilson
f9887e61e5
Added test for invalid quantile inputs
2015-08-29 14:14:13 +01:00
Robin Wilson
5f0665c99b
Raise ValueError if quantile thresholds outside of [0, 1] - and updated docs
2015-08-29 13:46:56 +01:00
Juan Nunez-Iglesias
ae17d88637
Merge pull request #1673 from oew1v07/watershed_markers
...
Updated the explanation of the watershed markers example.
2015-08-29 11:44:41 +01:00