Juan Nunez-Iglesias
5520ccdef3
Initial work on array dimension naming guide
2014-12-31 17:07:27 +11:00
Steven Silvester
d714d0bcbc
Separate qt version check from has_qt flag
2014-12-30 21:01:23 -06:00
Steven Silvester
7da4d5a19a
Merge pull request #2 from flying-sheep/pyqt5
...
fixed Qt5 compat
2014-12-30 20:57:13 -06:00
Phil Schaf
14a2b5d8f3
fixed Qt5 compat
2014-12-30 17:57:19 +01:00
Pratap Vardhan
d3f2d11230
DOC: Update bootstrap sphnix links
2014-12-28 16:26:27 +05:30
Steven Silvester
51ab675d3c
Fix lingering merge issue
2014-12-27 11:11:36 -06:00
Steven Silvester
f89ab053e1
Merge pull request #1314 from SalvatoreScaramuzzino/RectTool_docs
...
Rect tool docs
2014-12-27 11:01:08 -06:00
Steven Silvester
67fadc0ed8
Fix mock Qt objects again
2014-12-27 10:54:19 -06:00
Steven Silvester
42b330e562
Add QWidget to the mock Qt
2014-12-27 10:54:19 -06:00
Steven Silvester
8da175d70e
Add dummy Qt properties
2014-12-27 10:54:19 -06:00
Steven Silvester
c3ade4416f
Instantiate QtCore dummy class
2014-12-27 10:54:18 -06:00
Steven Silvester
7474db1f0d
Another fix for dummy Signal
2014-12-27 10:54:18 -06:00
Steven Silvester
6d445776c9
Fix the dummy Signal
2014-12-27 10:54:18 -06:00
Steven Silvester
11c6a9f86a
Fix another viewer import
2014-12-27 10:54:18 -06:00
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