c0a350cbcc
Merge remote-tracking branch 'origin/master' into v0.12.x
2016-03-08 01:30:18 -08:00
c6cde6c028
Merge pull request #1987 from soupault/fix_init_inpaint
...
Add inpaint to module init
2016-03-07 15:57:57 -08:00
caa2d220b6
Changed docsting sections order
2016-03-08 01:35:48 +03:00
4839ae40e5
Release version 0.12.2
2016-03-07 12:38:38 -08:00
dfffc55c36
Added inpaint to module init
2016-03-07 23:36:26 +03:00
b91bb168eb
Add .in files to source distribution
2016-03-07 12:35:58 -08:00
c48302d70b
Bring release notes and API changes in sync
2016-03-07 12:35:58 -08:00
a064e3d8a2
Merge branch 'master' into v0.12.x
...
Conflicts:
bento.info
skimage/__init__.py
2016-03-07 12:34:28 -08:00
6ecee1d56f
Merge pull request #1985 from stefanv/remove_lena
...
Remove lena image from test suite
2016-03-07 07:33:23 -06:00
cc4dbc0314
Merge pull request #1986 from stefanv/cython_version_check
...
Warn if user tries to build with older Cython version
2016-03-07 13:14:25 +01:00
ccc35c1ed0
Release v0.12.1
2016-03-07 01:44:26 -08:00
2953a7702b
Add .in files to source distribution
2016-03-07 01:41:42 -08:00
e1c2ea29dd
Warn if user tries to build with older Cython version
2016-03-07 01:38:22 -08:00
18da19e7b9
Remove left-over mentions in test docstrings of lena
2016-03-07 00:39:39 -08:00
78c0abeb17
Fix 2.6 compatibility
2016-03-07 00:37:26 -08:00
89136157bb
Remove lena image from test suite.
...
Results from the morphology module were compared against output from the
corresponding MATLAB functions, as applied to the lena test image. This image
does not conform to the Debian Free Software Guidelines and had to be removed.
The output is now tested against results generated with the current version of
scikit-image (0.12.0), which is known to be correct due to the comparison
described above.
2016-03-06 23:16:11 -08:00
2c9f512541
Bring release notes and API changes in sync
2016-03-06 22:56:47 -08:00
d8c18a9f15
Update version to 0.13dev
2016-03-06 18:25:28 -08:00
2436199022
Merge 'v0.12.x' branch
2016-03-06 18:24:06 -08:00
4e3b031567
Update v0.12 release instructions.
...
We forgot to mention the recent addition of 3D skeletonization.
2016-03-06 18:01:47 -08:00
50fa219975
Updated docversion.js
2016-03-05 17:44:41 +01:00
d5f4f32162
Modified bento.info and skimage/__init__.py with 0.12.0
2016-03-05 17:41:51 +01:00
6fb9bf0f83
Merge pull request #1981 from pradyumnanpk/bilateral_filter-enhancement
...
FIX: Scale bilateral filter win_size with sigma
2016-03-04 14:34:40 -06:00
29fa9e3047
Merge pull request #1937 from stefanv/test_parallel_fail
...
Raise at least one error for parallel tests.
2016-03-04 13:47:19 -06:00
edb147d22a
Merge pull request #1970 from alexandrejaguar/master
...
Format clean-ups in convex hull and otsu
2016-03-04 11:23:45 -08:00
16ed4ed865
Corrected a grammatical error in deprecated message. No functional change.
2016-03-04 09:29:32 -07:00
010df48453
Added deprecated kwargs to TODO.txt
2016-03-04 08:35:32 -07:00
f069aada3c
Supports skimage_range. Displays deprecated warning when used. Two test cases to test this functionality.
2016-03-04 08:34:47 -07:00
9e8ba42fb4
Merge pull request #1982 from stefanv/orb_no_of_keypoints
...
Fix ORB test
2016-03-04 13:37:09 +11:00
0ccff88945
Fix ORB test
...
In a previous PR, the scales were incorrectly copy-pasted.
2016-03-03 17:49:58 -08:00
729328ed6d
Merge pull request #1905 from stefanv/novice_undo
...
Add comparison and reset capability to novice module
2016-03-03 18:38:17 -06:00
deaac9cce5
Merge pull request #1976 from stefanv/mpl_warnings
...
Fix tests for matplotlib warnings generated by Template backend
2016-03-03 18:28:05 -06:00
428cc3daeb
Casted ceil to int such that win_size is an int.
2016-03-03 12:27:23 -07:00
ecf90e1cca
Added the chnage to comments
2016-03-03 12:01:57 -07:00
9f3fc737ba
sigma_range is renamed to sigma_color and win_size scales with sigma_spatial
2016-03-03 12:00:15 -07:00
7caf88f6ee
Fix assertion in novice test for older numpy versions
...
For older versions of numpy, `assert_equal(a, b)` failed for arbitrary objects
`a` and `b` even if they had ``__eq__`` defined. This is now fixed, but the
test is changed to use ``assert_true(a == b)`` to be backward compatible.
2016-03-02 18:59:27 -08:00
9e9207c718
Catch known Matplotlib warnings
...
`tight_layout` is not supported on all backends, so Matplotlib may raise a
warning, saying it is falling back to the Agg backend. Since we use the
'Template' backend in our tests, this warning pops up from time to time.
2016-03-02 18:54:14 -08:00
453efe974d
Ensure array data is always uint8
2016-03-02 17:20:19 -08:00
a8057ed941
Add reset and compare to novice module
...
- Reset restores the image to the original.
- Compare displays the original and the modified image side-by-side.
2016-03-02 16:22:24 -08:00
3ffca2fdbd
Extend plugins with imshow_collection
...
A first implementation is made for Matplotlib.
2016-03-02 16:22:24 -08:00
0d7289ea76
Merge pull request #1972 from jni/bump-cython
...
Bump Cython version to 0.23 in DEPENDS.txt
2016-03-01 07:19:09 -06:00
ce4a68f695
Solving space convex_hull + fixing local_otsu
...
Solving space convex_hull + fixing local_otsu
Solving space on censure
2016-03-01 11:27:55 +01:00
7f03d97c4d
Bump Cython version to 0.23 in DEPENDS.txt
...
This matches what was already implicit in our testing.
2016-03-01 18:01:54 +11:00
14852f4578
Merge pull request #1960 from sdsingh/profile_line
...
Update docstring for profile_line
2016-02-26 18:53:31 +11:00
7a2c80e70f
Fix spacing for inline comments
2016-02-25 17:24:29 -08:00
f6618ef8b2
Clean up profile-line docstring
2016-02-24 17:38:21 -08:00
7f5b9327fa
Update docstring for profile_line
2016-02-24 16:54:22 -08:00
5457b94132
Merge pull request #1951 from jmetz/update_peak_local_max_exclude_border
...
Updated exclude_border to not use min_distance
2016-02-24 12:19:39 +01:00
4244bb17a8
Fix: missing colon on additional tests of exclude_border values
2016-02-24 02:27:14 +00:00
488866cfe5
Added additional tests of exclude_border values
2016-02-24 02:06:09 +00:00
Stefan van der Walt