Commit Graph

7520 Commits

Author SHA1 Message Date
Johannes Schönberger 0a48c320b8 Merge pull request #1758 from JDWarner/hough_test
TST/STY: Hough transform regression test & Cython wrappers
2015-10-26 00:11:01 -04:00
Josh Warner (Mac) a3356194c8 TSTFIX: Fix imports in hough_ellipse doctest 2015-10-25 14:34:53 -05:00
Steven Silvester d776464324 Merge pull request #1756 from stefanv/doc_with_gallery
Ensure gallery pages are always generated
2015-10-25 14:23:39 -05:00
Josh Warner (Mac) 159c9f4e9e TST/STY: Hough tf regression test & Cython wrappers 2015-10-24 23:50:53 -05:00
Stefan van der Walt a93f30278a Ensure gallery pages are always generated 2015-10-23 22:49:22 -07:00
Stefan van der Walt 3c3a636e03 Merge pull request #1750 from jni/slic-param-scan
Refine docstring for 'compactness' kwarg in SLIC
2015-10-20 14:44:43 -07:00
Steven Silvester 85d5e7c584 Merge pull request #1734 from sumitbinnani/RenamingFilter
Refactoring gaussian_filter and gabor_filter (Ref: #1647)
2015-10-20 12:56:02 -05:00
Stefan van der Walt dba355da60 Merge pull request #1753 from blink1073/fix-numpy1.10
Fix adapthist indexing
2015-10-20 09:26:19 -07:00
Steven Silvester 41159f3fd2 Fix adapthist mask logic
Use minlength in bincount

Fix mask logic
2015-10-20 08:04:05 -05:00
Juan Nunez-Iglesias 7212fe3e82 Replace semicolon with full stop 2015-10-18 11:41:54 +11:00
Juan Nunez-Iglesias 4816d2ed0f Refine docstring for 'compactness' kwarg in SLIC
Addresses #1745
2015-10-17 13:16:39 +11:00
Josh Warner a2d74e5260 Merge pull request #1421 from hohlraum/hough_fix
FIX: Fix missing peaks in hough_line_peaks.
2015-10-08 18:48:48 -07:00
sumitbinnani bfba746a91 Adapting Edited Files to comply with PEP8 Standards
Changing Indentation as per PEP8 Guidelines
2015-10-07 14:21:36 +05:30
Juan Nunez-Iglesias 387cbda55a Merge pull request #1744 from blink1073/always-use-tiff
Move tiff-file handling to top level
2015-10-07 15:57:34 +11:00
Steven Silvester 1dae599eb1 Remove another tiff check in test_pil 2015-10-06 20:19:06 -05:00
Steven Silvester 1547ec39f3 Remove the tifffile save tests from test_pil 2015-10-06 20:18:16 -05:00
Steven Silvester d7a648ad55 Pop the img_num keyword if given 2015-10-06 19:58:50 -05:00
Steven Silvester e7b67618fd Move tiff-file handling to top level 2015-10-06 19:45:28 -05:00
Josh Warner 844b8b9052 Merge pull request #1738 from blink1073/test-3.5
TST: Test against py35, remove py32 test
2015-10-06 17:26:58 -07:00
Steven Silvester 4ccf7787a3 Remove 3.2 from travis build 2015-10-06 19:02:37 -05:00
Stefan van der Walt d66babe9bb Merge pull request #1741 from escorciav/peak-local-max-output-type
Fix output type of `peak_local_max`
2015-10-06 00:20:33 -07:00
sumitbinnani 0bae5f9137 Adding Alias and Deprecation Warning
* Added alias and deprecation warning for
```skimage.filters.gabor_filter```.
* Added alias and deprecation warning for
```skimage.filters.gaussian_filter```.
* Updated ```TODO.txt```
2015-10-06 00:18:38 +05:30
Victor Escorcia 7254c1e7b2 Fix output type of peak_local_max 2015-10-03 22:12:03 +03:00
sumitbinnani 811b6895cf Refactoring ``skimage.filters.gabor_filter` to `skimage.filters.gabor``
Refactoring ```skimage.filters.gaussian_filter``` to ```skimage.filters.gaussian```
2015-10-04 00:15:53 +05:30
Steven Silvester 730297def6 Use Dask 0.7.1 on Python 3.2
Try dask 0.7.2

Try dask 0.7.1

Fix comment
2015-10-03 13:34:14 -05:00
Steven Silvester 0d9987e2b3 Test against Python 3.5 on Travis
Add a test against py35

Restore PySide install for 3.5

Do not try and install simpleitk on py35

Fix syntax in optional requirements file

Allow simpleitk on python 3.4

Do not try simpleitk on py3.4
2015-10-03 13:34:02 -05:00
Juan Nunez-Iglesias 953fbfc539 Merge pull request #1725 from sciunto/unclosedfile
MAINT: use with to close the file
2015-09-22 16:14:39 +10:00
François Boulogne 811f13c1d6 MAINT: use with to close the file
MAINT: use with to close the file
2015-09-21 22:21:57 -04:00
Steven Silvester 9371ae7aa5 Merge pull request #1724 from sciunto/unclosedfile
MAINT: use with to close the file
2015-09-21 21:16:22 -05:00
François Boulogne 14588366e5 MAINT: use with to close the file 2015-09-21 21:47:06 -04:00
Stefan van der Walt 4e21f5dcef Merge pull request #1722 from blink1073/add-doc-deploy-notes
Add notes on how to deploy docs on Travis
2015-09-19 19:41:42 -07:00
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