Commit Graph

7427 Commits

Author SHA1 Message Date
Steven Silvester 2eee1faaff Fix import error in viewer.utils.core 2014-12-27 10:54:18 -06:00
Steven Silvester 6f57873526 Do not use ImportError behaviour in viewer
Conflicts:
	skimage/viewer/tests/test_tools.py
2014-12-27 10:54:13 -06:00
Steven Silvester 8d40cbd1d2 Allow viewer package to import without Qt 2014-12-27 10:52:30 -06:00
Steven Silvester 68508576f6 Remove debug raise 2014-12-27 10:52:30 -06:00
Steven Silvester 297ccea8b0 Do not try and guess the mpl backend 2014-12-27 10:52:30 -06:00
Steven Silvester 47065d733c Use a smarter backend selection 2014-12-27 10:52:30 -06:00
Steven Silvester 65c1d4eec6 Update viewer for PyQt5 compatibility
Conflicts:
	skimage/viewer/tests/test_plugins.py
	skimage/viewer/tests/test_tools.py
2014-12-27 10:52:27 -06:00
Juan Nunez-Iglesias 6f1eb316d2 Merge pull request #1325 from blink1073/remove-label-shim
Remove unnecessary `measure.label` shim
2014-12-27 15:21:59 +11:00
Steven Silvester b7f4f61ae7 Remove unnecessary measure.label shim
Conflicts:
	skimage/measure/_label.py
2014-12-26 21:34:33 -06:00
Juan Nunez-Iglesias 7b5dd3b700 Merge pull request #1313 from blink1073/suppress-test-warnings
Handle expected test warnings.
2014-12-27 14:26:59 +11:00
Steven Silvester ecc582193a Try using matplotlib cleanup decorator 2014-12-26 20:55:44 -06:00
Steven Silvester a7a84bbcde Draw the canvas when creating the ax to avoid RuntimeError 2014-12-26 20:14:41 -06:00
Steven Silvester f898bd0209 Style fixes 2014-12-26 11:26:30 -06:00
Juan Nunez-Iglesias 9c2807ac01 Merge pull request #1321 from ahojnnes/hough
Use typed memoryviews in Hough Transform
2014-12-27 00:38:38 +11:00
salvatore ac52af7d83 removed numpy import and spaces 2014-12-26 12:12:15 +01:00
Johannes Schönberger 0c2773b9e4 Use typed memoryviews 2014-12-26 11:08:05 +01:00
salvatore d28ae513ca Travis auto-build Doctest skipped to avoid window opening 2014-12-26 10:37:03 +01:00
Steven Silvester 736f5658bc Fix indent in docstring example 2014-12-25 17:08:36 -06:00
Steven Silvester d760c0adda Fix scipy.sparse.sparsetools warning 2014-12-24 11:20:52 -06:00
Steven Silvester bea57315fb Update docstring and fix pyamg warning check 2014-12-24 09:10:11 -06:00
Steven Silvester 23ae571689 Fix final failing test on Py2.6 build 2014-12-24 08:49:51 -06:00
Steven Silvester 2e0deb9595 Fix syntax error and missing | operator 2014-12-24 07:47:05 -06:00
Steven Silvester d37ccca598 Fix Py2.7 build errors 2014-12-24 06:54:56 -06:00
Steven Silvester 4453120d96 Allow warnings in the minimum build 2014-12-24 06:36:04 -06:00
Steven Silvester 2a6b4ccaea Import scipy.sparse in setup_test 2014-12-24 06:34:13 -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 01ca1d17c8 Add a random seed to the setup 2014-12-23 16:51:04 -06:00
Steven Silvester 1b905d4cef More cleanup and updating of tests
Clean up setup_test and add a teardown_test method

Implement new setup/teardown in novice tests

Fix warning handling in pil_plugin

Update rank tests
2014-12-23 16:50:50 -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 f72882fbd2 Import scipy before turning on warnings 2014-12-23 16:49:19 -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
Steven Silvester 79c648b14c Accommodate upcoming changes to RectangleSelector API 2014-12-23 16:48:37 -06:00
Steven Silvester 0debedd82c Handle more warnings and reset io plugins as needed
Reset plugins prior to running collections test

Handle warnings in morphology pkg

Add __init__ for morpohology tests

Handle warnings for novice pkg

Handle warnings for restoration pkg

Handle warnings for segmentation pkg

Handle warnings for _shared pkg

Handle warnings for transform pkg

Handle warnings for util pkg

Handle warnings in viewer module
2014-12-23 16:48:16 -06:00
Steven Silvester 9e8f91930e Handle warnings in several packages
Start handling warnings in data, exposure, and draw

Add a known_warning decorator and suppress warnings in color pkg

Use the existing all_warnings context manager

Raise warnings in data

Raise warnings in draw

Raise warnings in exposure

Suppress warnings in exposure tests

Add comments about warning suppressions

Raise warnings in feature

Fix warnings in filter package

Add warning handling to graph

Handle warnings in io package
2014-12-23 16:47:41 -06:00
Steven Silvester 874d68ba3f # This is a combination of 7 commits.
# The first commit's message is:
Add a known_warning decorator and suppress warnings in color pkg

# This is the 2nd commit message:

Use the existing all_warnings context manager

# This is the 3rd commit message:

Raise warnings in data

# This is the 4th commit message:

Raise warnings in draw

# This is the 5th commit message:

Raise warnings in exposure

# This is the 6th commit message:

Suppress warnings in exposure tests

# This is the 7th commit message:

Add comments about warning suppressions
2014-12-23 16:46:24 -06:00
Juan Nunez-Iglesias 8955bbf807 Merge pull request #1302 from ahojnnes/warp
Clip to min and max range of input image, add missing clip parameter to ...
2014-12-24 09:38:15 +11:00
Johannes Schönberger e38ed91c24 Add missing return value description 2014-12-23 15:22:22 +01:00
Johannes Schönberger e070274355 Add more description to doc string of helper function 2014-12-23 15:20:46 +01:00
Johannes Schönberger 0d2c5def06 Use in-place operation for clipping 2014-12-23 13:51:25 +01:00
Johannes Schönberger 451d8aa697 Fix novice module with new dtype behavior 2014-12-23 12:44:16 +01:00
Johannes Schönberger 20d81529f4 Fix matching test cases 2014-12-23 12:40:15 +01:00
salvatore ad96b911ab ... added in indented code 2014-12-22 20:49:44 +01:00
Johannes Schönberger a1a2f9c988 Remove __init__.py from tests folder, remove unnecessary load of test image 2014-12-22 20:39:18 +01:00