7299 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jonathan Helmus	00a841f1c2	MAINT: Refactored imports	2015-07-28 14:11:51 -05:00
Jonathan Helmus	f10ae88139	MAINT: remove unchecked import from util.dtype	2015-07-28 14:06:03 -05:00
Jonathan Helmus	d2519d610f	ENH: Build check in skimage/__init__.py module	2015-07-28 14:00:32 -05:00
Jonathan Helmus	9727711405	Removed __check_build directory	2015-07-28 13:43:48 -05:00
Jonathan Helmus	b92c5653cd	BLD: Updated bento.info with _check_build extension	2015-07-28 13:16:09 -05:00
Jonathan Helmus	93366d1b57	MAINT: Fixed __check_build setup.py file	2015-07-28 13:16:09 -05:00
Jonathan Helmus	64c4252eab	BLD: __SKIMAGE_SETUP__ global variable for detecting build ... The __SKIMAGE_SETUP__ global variable is set to True if skimage is being build from the main setup.py file, False if not. This behavior is modeled after a similar setup in scikit-learn	2015-07-28 13:16:09 -05:00
michaelpacer	edc16c6b75	Added build location checker, does not fully work yet. Complicated error.	2015-07-28 13:14:41 -05:00
Stefan van der Walt	3042242c8d	Merge pull request #1614 from blink1073/handle-pip-upgrade ... Do not try and upgrade other large dependencies on pip install	2015-07-27 14:16:01 -07:00
Juan Nunez-Iglesias	c2f8c4ab12	Merge pull request #1599 from blink1073/viridis ... Add the viridis colormap and use it for non-standard images	2015-07-22 12:54:07 +10:00
Steven Silvester	5632c9c1a9	Only add colorbar if the cmap is not the default	2015-07-16 21:39:05 -05:00
Steven Silvester	9fb7676c92	Fix relative import	2015-07-16 21:28:37 -05:00
Stefan van der Walt	70b4e41cd8	Merge pull request #1613 from blink1073/better-test-warnings ... Add "all" warnings for skimage package to Travis tests	2015-07-16 18:30:35 -07:00
Stefan van der Walt	88862b7133	Merge pull request #1612 from blink1073/fix-manage-plugins ... Be more explicit about configparser import	2015-07-16 18:17:57 -07:00
Steven Silvester	eaaea690f2	Allow viridis to be used by name	2015-07-16 07:58:14 -05:00
Steven Silvester	3d963649fc	Use a less-invasive approach	2015-07-16 07:56:14 -05:00
Steven Silvester	6c32be45a6	Do not try and upgrade larger dependencies on skimage install	2015-07-16 06:32:20 -05:00
Steven Silvester	a032b9d71a	Do not try and update scipy on a pip install if already installed	2015-07-16 06:22:50 -05:00
Steven Silvester	3d044af4da	Be more explicit about configparser import	2015-07-15 21:22:41 -05:00
Steven Silvester	c8b0765c43	Try using debug and all skimage warnings	2015-07-15 21:01:13 -05:00
Stefan van der Walt	8860f8177b	Merge pull request #1610 from blink1073/pyqt-test ... Reinstate PyQt4 test on Travis	2015-07-15 16:50:30 -07:00
Juan Nunez-Iglesias	45676a639c	Merge pull request #1609 from blink1073/quiet-travis ... Make all of the pip installs quiet to fit in 10000 lines	2015-07-15 13:31:47 -04:00
Steven Silvester	4fb80b8f40	Add an explicit pip cache since we override the install step	2015-07-15 10:07:46 -05:00
Steven Silvester	5285408a33	Try and install pyqt on the container	2015-07-15 08:25:01 -05:00
Steven Silvester	8207863e02	Enable deprecation warnings	2015-07-15 08:22:08 -05:00
Steven Silvester	e309845dab	Use default warning print behaviour	2015-07-15 08:20:26 -05:00
Steven Silvester	9f3885f473	Try only warning once per module	2015-07-15 08:19:43 -05:00
Josh Warner	24b3a81dd9	Merge pull request #1604 from blink1073/pil-close ... FIX: Do not let PIL manage the file handle.	2015-07-14 21:47:32 -05:00
Steven Silvester	90da42fcde	Make all of the pip installs quiet to try and fit in 10000 lines	2015-07-14 21:26:06 -05:00
Juan Nunez-Iglesias	7124716d24	Merge pull request #1547 from blink1073/adapthist-window ... Update Adapthist to use more intelligent tiles	2015-07-14 14:08:17 -04:00
Steven Silvester	8122e26731	Add another file guard	2015-07-14 09:28:53 -05:00
Steven Silvester	b75ee66a61	Clean up tests by using fresh figures	2015-07-14 07:47:59 -05:00
Steven Silvester	a8580f76b3	Always create a colorbar and update tests	2015-07-14 07:47:59 -05:00
Steven Silvester	756b9289c9	Add the viridis colormap and make it the default	2015-07-14 07:47:59 -05:00
Steven Silvester	80fe225fc8	Fix failing test	2015-07-14 07:47:22 -05:00
Steven Silvester	085be65e83	Remove use of view_as_window and fix docstring	2015-07-14 07:47:22 -05:00
Steven Silvester	603844431a	More variable renaming	2015-07-14 07:47:22 -05:00
Steven Silvester	323a2791bb	Rename variable for clarity	2015-07-14 07:47:22 -05:00
Steven Silvester	d755decf15	Remove debug print	2015-07-14 07:47:22 -05:00
Steven Silvester	acc9a8a748	Use smarter indexing	2015-07-14 07:47:22 -05:00
Steven Silvester	1f56de9595	Remove min_overlap kwarg	2015-07-14 07:47:22 -05:00
Steven Silvester	c948f9fe97	Fix view as windows test	2015-07-14 07:47:22 -05:00
Steven Silvester	3aafbb78dd	Rename optimal_step and add comments	2015-07-14 07:47:22 -05:00
Steven Silvester	489ae2ec1a	Fix rebase error	2015-07-14 07:47:22 -05:00
Steven Silvester	944e7204b7	wip ... wip Update tests Docstring and TODO Update docstring Style fixes Update equalize_adapthist to use new view_as_windows Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports Style fixes Add a deprecation warning and add to api_changes.txt Update TODO and switch to 0.13 deprecation Preserve the current API as much as possible and defer to 0.14 Move the new kwarg to the very end Clarify deprecation warning Update to use row/col in clahe Update docstring Use optimal_step to set up view_as_windows Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports Style fixes Add a deprecation warning and add to api_changes.txt Update TODO and switch to 0.13 deprecation Preserve the current API as much as possible and defer to 0.14 Move the new kwarg to the very end Clarify deprecation warning Update docstring	2015-07-14 07:47:22 -05:00
Steven Silvester	5ba3cad178	Update tests ... Docstring and TODO Update docstring Style fixes Update equalize_adapthist to use new view_as_windows Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports Style fixes Add a deprecation warning and add to api_changes.txt Update TODO and switch to 0.13 deprecation Preserve the current API as much as possible and defer to 0.14 Move the new kwarg to the very end Clarify deprecation warning Update to use row/col in clahe Update docstring Use optimal_step to set up view_as_windows Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports Style fixes Add a deprecation warning and add to api_changes.txt Update TODO and switch to 0.13 deprecation Preserve the current API as much as possible and defer to 0.14	2015-07-14 07:47:21 -05:00
Steven Silvester	733b62890a	Docstring and TODO ... Update docstring Style fixes Update equalize_adapthist to use new view_as_windows Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports Style fixes Add a deprecation warning and add to api_changes.txt Update TODO and switch to 0.13 deprecation Preserve the current API as much as possible and defer to 0.14 Move the new kwarg to the very end Clarify deprecation warning Update to use row/col in clahe Update docstring Use optimal_step to set up view_as_windows Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports Style fixes Add a deprecation warning and add to api_changes.txt Update TODO and switch to 0.13 deprecation	2015-07-14 07:47:21 -05:00
Steven Silvester	e42cb6fadf	Update docstring ... Style fixes Update equalize_adapthist to use new view_as_windows Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports Style fixes Add a deprecation warning and add to api_changes.txt Update TODO and switch to 0.13 deprecation Preserve the current API as much as possible and defer to 0.14 Move the new kwarg to the very end Clarify deprecation warning Update to use row/col in clahe Update docstring Use optimal_step to set up view_as_windows Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports Style fixes Add a deprecation warning and add to api_changes.txt	2015-07-14 07:47:21 -05:00
Steven Silvester	6017e38e67	Style fixes ... Update equalize_adapthist to use new view_as_windows Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports Style fixes Add a deprecation warning and add to api_changes.txt Update TODO and switch to 0.13 deprecation Preserve the current API as much as possible and defer to 0.14 Move the new kwarg to the very end Clarify deprecation warning Update to use row/col in clahe Update docstring Use optimal_step to set up view_as_windows Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports Style fixes	2015-07-14 07:47:21 -05:00
Steven Silvester	998be36c2d	Update equalize_adapthist to use new view_as_windows ... Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports Style fixes Add a deprecation warning and add to api_changes.txt Update TODO and switch to 0.13 deprecation Preserve the current API as much as possible and defer to 0.14 Move the new kwarg to the very end Clarify deprecation warning Update to use row/col in clahe Update docstring Use optimal_step to set up view_as_windows Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports	2015-07-14 07:47:21 -05:00