Commit Graph

346 Commits

Author SHA1 Message Date
arve0 6fceaa2f75 import from _label instead of _ccomp 2015-03-14 23:22:15 +01:00
Steven Silvester 0e61374a89 Add a helper function to check for low contrast
Add a helper function to check for low contrast

Add a check for low contrast when using imsave

Use the low contrast helper in imshow and make sure warnings are always shown

Clean up parameter names and add doctests

Remove unnecessary warning context

Remove unnecessary warning context

Add dtype ranges for 64bit types

Update tests with new warnings

Fix doctest logic

Fix doctest logic

Add a low contrast test with multiple dtypes

Fix check for color images

Fix color check again

Add support for int32 types

Relax assertion for 32bit builds

Add a low contrast test with multiple dtypes

Add a low contrast test with multiple dtypes

Fix check for color images

Fix color check again

Add support for int32 types
2015-03-09 21:34:58 -05:00
Johannes Schönberger 47a4418140 Use np.inf instead of float('inf') 2015-03-08 19:37:53 -04:00
Johannes Schönberger d6a737bf86 Update doctest for new estimator API 2015-03-08 13:13:46 -04:00
Johannes Schönberger eb6c3ede38 Fix RANSAC for invalid model estimation and confidence corner case
Previously, estimators did not return whether the model estimation
was successful. RANSAC now tests whether the estimation was
successful and skips invalid models.

When the confidence/stop_probability of RANSAC was set to 1,
the iteration was falsely terminated early instead of running for
the maximum number of iterations.
2015-03-06 23:47:08 -05:00
Jonathan Helmus 78a0eb6b98 Implement appveyor builds
Implement Appveyor builds

initial test

Updated appveyor.yml

New nosetest call

With conda update conda

with pillow

without pillow

TST: Change case sensitivive JPG extension

Revert "TST: Change case sensitivive JPG extension"

This reverts commit 2deed7cc63736f7c6f0387bd37df4c6643c32847.

Trying with Python 2.7

Trying with version env

Trying again with variables

Testing on all Python versions

don't allow failures

Allow failure

Do not actually use tests

Ignore failing tests

Removed Python 2.6 test

Testing only Python 2.6

Testing out more sklearn like AppVeyor CI

Added install to pip

Add artifacts

Enabled all permutations

Disable 2.6, add PIL

Python 2.6, 2.7 only with PIL

Testing with variable dependencies

Allow failure with IF ELSE

With Python 3.4

Scikit-learn like appveyor CI

Fixing paths

Undo path fix

path fix single line

path fix single line 2

Using Miniconda

More path fixes

New wheelhouse link

Added pillow to requirements.txt

Added networkx to requirements.txt

Add testing of 32/64-bit Python 2.7 and 3.4 to matrix

Debugging Cython compile

Retry with all 4 builds

Updated install.ps1 file

Updated based on latest python-appveyor-demo

Debugging pip install

Specify numpy 1.8.1 until whl is uploaded to rackspace

Use skimage-wide requirements.txt file

Minor comment change to trigger build

Install wheel and then install from WHEELHOUSE

Install six from pip

Install networkx from pip

Install pyparsing from pip

Install pytz from pip

Try using just find-links

Install the binary dependencies first, then the rest

Add pillow to the install list

Fix appveyor.yml syntax

Fix requirements.txt syntax

Fix requirements.txt syntax again

Fix appveyor call to initial install

Fix appveyor call to initial install again

Fix appveyor call to initial install yet again

Install wheel

Install wheel first

Install wheel and nose in the appveyor requirements.txt

Fix Python3 version to match python ftp site

Only use cleanup decorator if available

Add debug info to multiimage test

More debugging information

Fix handling of path separators on Windows

Add another warning guard

Fix warning handling for non-windows

Do not use TkAgg as it may be causing alloc error

Clean up echo command

Allow for unclosed file warning

Fix spacing in echo command
2015-02-28 19:57:45 -06:00
Josh Warner (Mac) ea02a4e348 FIX: Ignore exception if attempted deletion fails (fixes #817) 2015-02-28 17:11:31 -06:00
Steven Silvester 09876408fc Fix some sphinx warnings and add to build
Fix some sphinx warnings

Add documentation build to test

Add documentation build to test

Remove change in numpydoc

Remove change in apigen

Add makefile target for html and add to travis script

Add a makefile target for html and add to travis script

Fix more sphinx warnings
2015-02-07 16:40:26 -06:00
Stefan van der Walt 13f9b89023 Merge pull request #1319 from ahojnnes/geom-est
Improve conditioning of geometric transformations
2015-01-28 13:31:25 -08:00
Steven Silvester b6a1bcdb06 Merge pull request #1324 from ahojnnes/rel-import
Use relative imports in skimage files
2015-01-25 15:26:34 -06:00
Johannes Schönberger d3c4c704fe Speedup regionprops 2015-01-22 07:53:10 -05:00
Johannes Schönberger ee5c6fbeb2 Use relative imports in skimage files 2015-01-22 07:36:48 -05:00
Johannes Schönberger ad85dfabd5 Disable catch of all warnings, return nan params instead 2015-01-22 06:49:16 -05:00
Johannes Schönberger acf68c6d7c Add new parameter to catch exceptions during RANSAC 2015-01-21 14:10:09 -05:00
Steven Silvester b7f4f61ae7 Remove unnecessary measure.label shim
Conflicts:
	skimage/measure/_label.py
2014-12-26 21:34:33 -06:00
Steven Silvester f898bd0209 Style fixes 2014-12-26 11:26:30 -06:00
Steven Silvester cb2745cfdf Change default neighbors to None 2014-12-24 05:57:37 -06:00
Steven Silvester 3829401e9f Fix label wrapper function 2014-12-23 21:20:23 -06:00
Steven Silvester 2d3ada19e5 Allow for no exceptions to be raised and cleanup
Allow for no exceptions to be raised

Add some helpful comments

Remove doctest skips

Remove TODO note

Cleanup and skip failing doctest
2014-12-23 16:51:18 -06:00
Steven Silvester c0a0490eed Fix handling of multiple warnings and update tests
Fix handling of multiple warnings

Update all test __init__ files

Update segmentation pkg

Update the color pkg

Update the exposure pkg

Update the filters pkg

Update the io pkg

Update the measure pkg

Update morphology package

Restructure test setup function

Add expected_warnings to __all__

Update restoration pkg.

Remove explicit filter check since it is done elsewhere

Fix the image test helpers

Update the transform pkg

Fix util pkg

Update viewer pkg
2014-12-23 16:51:06 -06:00
Steven Silvester a4e4e57ba5 Create new expected_warnings helper and some cleanup
Add new helper function for expected warnings during test

Indentation cleanups and avoid skipping doctests if possible.
2014-12-23 16:50:18 -06:00
Steven Silvester 782ba46a4c Handle more warnings
Punt on the issue of warnings with the minimum build

Handle warnings in measure pkg

Fix the rank filter test by forcing a random seed in the function

Compare as boolean in imread test

Import loadmat in test_setup to avoid warning

Use a setup method for imread plugin test

Revoke unintended changes

Fix indentation to appease jni

More indentation fixes

Fix unintentional comment out
2014-12-23 16:49:59 -06:00
Steven Silvester 6db92d387b More doctest and pil_plugin fixes
Fix Python2 imread in pil_plugin.

Load from data

Use all_warnings when importing the other packages

More fixes for regionprops doctest
2014-12-23 16:49:38 -06:00
Steven Silvester 4680f30466 Add a test setup helper function
Add a function to set up a skimage test

Switch to new test helper function

Import local packages that raise warnings in test setup function

More fixes to doctests

Fix regionprops doc test

Try and fix the test_rank failure.

Remove no longer needed RectangleSelector shim

Skip more doctests in _regionprops

Try importing another scipy subpackage
2014-12-23 16:49:20 -06:00
Steven Silvester 542cd4fabe Fix some doctest warnings
Fix doctest errors

Suppress warnings when importing scipy.ndimage for the first time
2014-12-23 16:49:01 -06:00
Steven Silvester 2756358f3c Clean up PIL plugin and handle more warnings
Use the pil plugin to load data files

Fix install_requires string formatting

Dead end commit

Make all tools executable

Remove debug print

Suppress PIL resourcewarnings

Handle a few more warnings
2014-12-23 16:48:38 -06:00
Pratap Vardhan b72a960670 DOC: Misc spell corrections 2014-12-16 11:41:24 +05:30
Johannes Schönberger 125d53ba52 Add test cases for invalid block sizes 2014-12-15 09:50:10 +01:00
Johannes Schönberger 813142baf8 Check for invalid upsampling block sizes 2014-12-15 09:50:07 +01:00
Johannes Schönberger 3a1079a180 Misc PEP8 fixes 2014-12-14 02:56:14 +01:00
emmanuelle 873a2bab4f Modified a few docstrings that made doctesting fail 2014-12-07 16:58:36 +01:00
Stefan van der Walt 36aa4cdb6f Merge pull request #1254 from matejak/label3d
Refactor labeling and extend to 3D
2014-12-04 12:31:29 +02:00
Jacopo 77a78a287c Updated docs for regionprops to reflect the dropping of regions with label value 0 2014-12-03 11:09:46 +10:00
Matěj Týč c6ebe6c661 Removed negative connectivity support as requested 2014-12-02 22:34:04 +01:00
Matěj Týč e41bff898a Added fix for the strange input array shapes + tests 2014-11-28 16:45:52 +01:00
Johannes Schönberger 8a67733567 Add encoding header 2014-11-26 18:26:34 -05:00
Johannes Schönberger fc0a6064d7 Use uint8 type for simple moments functions 2014-11-26 17:08:42 -05:00
Johannes Schönberger 71a5437794 Add fused type specialization for moments functions 2014-11-26 17:03:50 -05:00
Matěj Týč 3b4425813b Streamlined connectivity vs neighbors handling 2014-11-25 00:37:19 +01:00
Matěj Týč ac11b61502 Fixed typos, added array shape checking 2014-11-23 23:45:32 +01:00
Matěj Týč d07caea5a8 Mended code style 2014-11-23 23:17:01 +01:00
Matěj Týč a4b841daf0 Fixed bugs 2014-11-19 23:16:33 +01:00
Matěj Týč 53e1912854 Merge branch 'label3d' of https://github.com/matejak/scikit-image into label3d 2014-11-19 23:03:07 +01:00
Matěj Týč fe4a9b5847 Made the scan code cleaner and faster (but longer) 2014-11-19 23:02:34 +01:00
Matěj Týč 20755da3fe Fixed typos and made some style fixes 2014-11-19 21:32:27 +01:00
Matěj Týč 06c46ec51e Introduced the connectivity parameter, regrouped some code 2014-11-18 23:45:54 +01:00
Matěj Týč abf3dbc593 Added and tested proper exception handling concerning array shape 2014-11-16 15:33:13 +01:00
Matěj Týč eb55d177c3 Removed declaration of deceased function 2014-11-15 17:11:45 +01:00
Matěj Týč d29831882d Redone the background handling = considerable speedup 2014-11-15 16:42:22 +01:00
Matěj Týč 67464e2081 Fixed a typo + cleaned the code semantics 2014-11-15 16:11:31 +01:00