07775b6b54
Merge branch 'remove_small_holes' of https://github.com/oew1v07/scikit-image into remove_small_holes
...
Need to merge with work completed elsewhere
2015-10-07 11:00:02 +01:00
815c5c8ee7
Added new line
2015-10-07 10:59:26 +01:00
bfba746a91
Adapting Edited Files to comply with PEP8 Standards
...
Changing Indentation as per PEP8 Guidelines
2015-10-07 14:21:36 +05:30
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
1dae599eb1
Remove another tiff check in test_pil
2015-10-06 20:19:06 -05:00
1547ec39f3
Remove the tifffile save tests from test_pil
2015-10-06 20:18:16 -05:00
d7a648ad55
Pop the img_num keyword if given
2015-10-06 19:58:50 -05:00
e7b67618fd
Move tiff-file handling to top level
2015-10-06 19:45:28 -05:00
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
4ccf7787a3
Remove 3.2 from travis build
2015-10-06 19:02:37 -05:00
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
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
7254c1e7b2
Fix output type of peak_local_max
2015-10-03 22:12:03 +03:00
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
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
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
9025c020ae
Adjusting spacing of array in doctests
2015-09-25 14:55:13 +01:00
5c7c67db12
Made changes to doctests
2015-09-25 14:51:06 +01:00
19fbdfb6fe
Adjusted white space for doctests
2015-09-24 11:58:40 +01:00
413ac4a53b
Altered doctests to correct spacing
2015-09-23 21:24:11 +01:00
a3bb9401c2
Moved the comments on labeled arrays to notes section
2015-09-22 17:41:22 +01:00
3f735b6482
Changed the test file to use expected warnings.
...
This is with help from @blink1073
2015-09-22 17:35:32 +01:00
e822e5a556
DOC : add ref to nlmeans in the API
2015-09-22 11:14:33 +02:00
953fbfc539
Merge pull request #1725 from sciunto/unclosedfile
...
MAINT: use with to close the file
2015-09-22 16:14:39 +10:00
811f13c1d6
MAINT: use with to close the file
...
MAINT: use with to close the file
2015-09-21 22:21:57 -04:00
9371ae7aa5
Merge pull request #1724 from sciunto/unclosedfile
...
MAINT: use with to close the file
2015-09-21 21:16:22 -05:00
14588366e5
MAINT: use with to close the file
2015-09-21 21:47:06 -04:00
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
05d0202712
Add notes on how to deploy docs on Travis
2015-09-19 21:19:48 -05:00
9ac63b32b8
Merge pull request #1721 from sciunto/fixurl
...
DOC fix broken url
2015-09-19 13:37:11 -04:00
42784a45bc
DOC fix broken url
2015-09-19 13:10:23 -04:00
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
252cf8b5b9
Try with a token encrypted in this repo
2015-09-19 08:47:28 -05:00
2063dd109c
Merge pull request #1719 from blink1073/another-docs-build
...
Encrypt token for target repo
2015-09-18 21:34:24 -07:00
b272785409
Fix variable name
2015-09-18 21:33:35 -05:00
e3167112a9
Another fix
2015-09-18 21:33:03 -05:00
87dfaf3074
Fix variable name
2015-09-18 21:31:00 -05:00
e1c57be1c4
Encrypt token for target repo
2015-09-18 21:28:49 -05:00
67b89e6e6d
Merge pull request #1717 from sciunto/doctravis
...
DOC: fix env variable GH_TOCKEN
2015-09-18 20:30:05 -05:00
c1559041ab
DOC: fix env variable GH_TOCKEN
2015-09-18 21:24:50 -04:00
5f27db9c08
Merge pull request #1716 from blink1073/docs-build-again
...
Try with debug output
2015-09-18 15:05:14 -07:00
6f8cfc7001
Try with debug output
2015-09-18 10:16:54 -05:00
2c153823c7
Merge pull request #1715 from blink1073/docs-build-token
...
Update docs build token
2015-09-18 07:54:19 -07:00
0fee62f6fd
Update token
2015-09-18 06:55:57 -05:00
e57cce5b4a
Merge pull request #1713 from blink1073/docs-fix-take-3
...
Fix Travis documentation upload
2015-09-17 18:22:23 -07:00
4c345666bd
gh-pages is the default target branch
2015-09-17 20:06:25 -05:00
f6b03f4d86
Merge pull request #1711 from blink1073/docs-push-again
...
Fix variable check in docs deployment
2015-09-17 15:10:22 -07:00
82ad2a7fd0
Fix variable check
2015-09-17 12:34:39 -05:00
08f0677277
Merge pull request #1710 from sciunto/favicon
...
DOC: activate favicon in config + fix doc push
2015-09-17 08:49:02 -05:00
c7597d6942
Changed function name to _check_dtype_supported
2015-09-17 13:45:01 +01:00
Olivia Wilson