wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-19 11:27:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,126 Commits 8 Branches 45 Tags
b2a2301df648a07145ef6ebdfa7f0635d80edc31
Commit Graph
8126 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Steven Silvester b2a2301df6 Merge pull request #1966 from vighneshbirodkar/gitignore 
Modified .gitignore to properly ignore auto_example files
 2016-03-19 12:44:45 -05:00
Josh Warner 030836114c Merge pull request #2016 from blink1073/upgrade-tifffile 
MAINT: Upgrade tifffile
 2016-03-19 10:26:51 -07:00
Johannes Schönberger 1e9aac2842 Merge pull request #2017 from soupault/fix_doc_quickshift 
skimage.segmentation.quickshift signature is missing from API docs
 2016-03-19 15:13:16 +01:00
Egor Panfilov 85b7f6ba48 Fixed quickshift signature, added cdef on kernel_size 2016-03-19 15:23:09 +03:00
Steven Silvester 35a9a5da06 Merge pull request #1934 from SalvatoreScaramuzzino/Doc-PaintTool 
added doc to PaintTool
 2016-03-19 06:48:46 -05:00
Steven Silvester 34ae6805d5 Merge pull request #1954 from soupault/gh_templates 
Github templates
 2016-03-19 06:17:12 -05:00
Steven Silvester 7bb7643908 Skip more tests 2016-03-19 04:47:11 -05:00
Josh Warner 0737ff8519 Merge pull request #1938 from stefanv/test_against_numpy_pre-releases 
BUILD: Use --pre flag for Travis pip installs.
 2016-03-18 22:30:10 -07:00
Steven Silvester 2e6fcd4dd8 Upgrade tifffile 2016-03-18 23:15:40 -05:00
Stefan van der Walt 142621c350 Merge pull request #2014 from stefanv/fix_mpl_warnings 
Correct regexp for catching mpl warnings
 2016-03-18 18:00:51 -07:00
Stefan van der Walt caeb67a843 Correct regexp for catching mpl warnings 2016-03-18 14:32:21 -07:00
Stefan van der Walt f8e03d475e Use variables to control Travis build matrix 2016-03-18 13:45:30 -07:00
Stefan van der Walt 1134864317 Use --pre flag for Travis pip installs. 
This way we can help NumPy and others test their pre-releases.
 2016-03-18 13:45:30 -07:00
Steven Silvester 74a8061597 Merge pull request #2013 from stefanv/dask_optional 
Turn `dask` into an optional dependency
 2016-03-17 07:55:51 -05:00
Stefan van der Walt 2df22d2fc5 Turn dask into an optional dependency 
Dask is not yet packaged on all platforms, so make it optional for now.
 2016-03-16 16:50:57 -07:00
Vighnesh Birodkar c35813fdec Removed unnecessary blank_image.png file 2016-03-16 19:27:26 -04:00
Egor Panfilov 81970bab62 Added GitHub templates, moved CONTRIBUTING.md to .github 2016-03-17 01:49:58 +03:00
Stefan van der Walt b9b5fde082 Merge pull request #2009 from sdsingh/contributing 
Fix docs-->doc in CONTRIBUTING
 2016-03-16 14:37:15 -07:00
Shaun Singh 04d347a1fe Fix docs-->doc in CONTRIBUTING 2016-03-16 14:14:16 -07:00
Steven Silvester cc5d574d34 Upgrade the vendored tifffile 2016-03-16 05:46:20 -05:00
Vighnesh Birodkar 952e7ec77f Changed pattern. 2016-03-16 02:06:58 -04:00
Steven Silvester 401c1fd9c7 Merge pull request #2001 from sciunto/doc_userguide 
[DOC] add link to guide
 2016-03-14 07:02:44 -05:00
François Boulogne 44266f42c4 [DOC] add link to guide 
extra fix
 2016-03-13 18:19:19 +01:00
Josh Warner 5dcac33bf8 Merge pull request #1999 from grlee77/ssim_err 
DOC: Suggest multichannel=True in compute_ssim error
 2016-03-11 11:02:55 -06:00
Gregory R. Lee 068663b7fe explicitly suggest using multichannel in compute_ssim error message 2016-03-11 10:11:46 -05:00
Steven Silvester 16fbf6737a Merge pull request #1994 from grlee77/ssim_fix 
avoid deprecation warnings when calling compute_ssim with multichannel=True
 2016-03-09 15:18:24 -06:00
Gregory R. Lee 5ac3255065 FIX: remove use of deprecated call to structural_similarity from within compute_ssim 2016-03-09 15:00:05 -05:00
Johannes Schönberger a34a301f1f Merge pull request #1992 from stefanv/clean_all_md5 
Remove all .md5 files on clean
 2016-03-09 13:44:25 +01:00
Stefan van der Walt 08a08d747d Remove all .md5 files on clean 2016-03-09 00:28:42 -08:00
Stefan van der Walt f302c45b6d Merge pull request #1990 from rodrigob/patch-2 
Also expose rgb2gray as rgb2grey
 2016-03-08 10:15:10 -08:00
Rodrigo Benenson 23cfaec724 Follow-up of PR #1989 
exposing grey2rgb at the module level.
 2016-03-08 17:01:00 +01:00
Steven Silvester 701fa1b1fd Merge pull request #1989 from rodrigob/patch-1 
rgb2grey -> grey2rgb
 2016-03-08 09:44:55 -06:00
Rodrigo Benenson 362b68c055 rgb2grey -> grey2rgb 
Simply added `grey2rgb = gray2rgb` to match the existing rgb2grey.
 2016-03-08 15:56:26 +01:00
Stefan van der Walt b0e12ea530 Merge pull request #1980 from pradyumnanpk/match_template-enhancement 
Pre-calculate tempate mean
 2016-03-08 02:24:09 -08:00
Stefan van der Walt c6cde6c028 Merge pull request #1987 from soupault/fix_init_inpaint 
Add inpaint to module init
 2016-03-07 15:57:57 -08:00
Egor Panfilov caa2d220b6 Changed docsting sections order 2016-03-08 01:35:48 +03:00
Egor Panfilov dfffc55c36 Added inpaint to module init 2016-03-07 23:36:26 +03:00
Stefan van der Walt b91bb168eb Add .in files to source distribution 2016-03-07 12:35:58 -08:00
Stefan van der Walt c48302d70b Bring release notes and API changes in sync 2016-03-07 12:35:58 -08:00
Josh Warner 6ecee1d56f Merge pull request #1985 from stefanv/remove_lena 
Remove lena image from test suite
 2016-03-07 07:33:23 -06:00
Emmanuelle Gouillart 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
Stefan van der Walt e1c2ea29dd Warn if user tries to build with older Cython version 2016-03-07 01:38:22 -08:00
Stefan van der Walt 18da19e7b9 Remove left-over mentions in test docstrings of lena 2016-03-07 00:39:39 -08:00
Stefan van der Walt 78c0abeb17 Fix 2.6 compatibility 2016-03-07 00:37:26 -08:00
Stefan van der Walt 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
Stefan van der Walt d8c18a9f15 Update version to 0.13dev 2016-03-06 18:25:28 -08:00
Stefan van der Walt 2436199022 Merge 'v0.12.x' branch 2016-03-06 18:24:06 -08:00
Stefan van der Walt 4e3b031567 Update v0.12 release instructions. 
We forgot to mention the recent addition of 3D skeletonization.
 2016-03-06 18:01:47 -08:00
emmanuelle 50fa219975 Updated docversion.js v0.12.0 2016-03-05 17:44:41 +01:00
emmanuelle d5f4f32162 Modified bento.info and skimage/__init__.py with 0.12.0 2016-03-05 17:41:51 +01:00