4585 Commits

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	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
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
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	3d044af4da	Be more explicit about configparser import	2015-07-15 21:22:41 -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	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	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
Steven Silvester	1b30c68d28	# This is a combination of 10 commits. ... # The first commit's message is: Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports # This is the 2nd commit message: Style fixes # This is the 3rd commit message: Add a deprecation warning and add to api_changes.txt # This is the 4th commit message: Update TODO and switch to 0.13 deprecation # This is the 5th commit message: Preserve the current API as much as possible and defer to 0.14 # This is the 6th commit message: Move the new kwarg to the very end # This is the 7th commit message: Clarify deprecation warning # This is the 8th commit message: Update to use row/col in clahe # This is the 9th commit message: Update docstring # This is the 10th commit message: Use optimal_step to set up view_as_windows	2015-07-14 07:47:21 -05:00
Steven Silvester	f6653b781f	Fix tifffile plugin import	2015-07-14 07:45:41 -05:00
Steven Silvester	b67a4e3076	Move the tifffile wrapper to tiff plugin	2015-07-14 07:45:41 -05:00
Steven Silvester	182a6f6904	Fix handling of tiffile handles	2015-07-14 07:45:41 -05:00
Steven Silvester	6d7e0554a4	Use context manager for tif imread as well	2015-07-14 07:45:41 -05:00
Steven Silvester	66805cabdf	Try fixing the remaining unclosed error	2015-07-14 07:45:41 -05:00
Steven Silvester	2fb59b9243	Fix variable name	2015-07-14 07:45:41 -05:00
Steven Silvester	1a27bea7da	Allow pil imread to accept file-like objects again	2015-07-14 07:44:34 -05:00
Steven Silvester	f1471dfd72	Remove offending line	2015-07-14 07:44:34 -05:00
Steven Silvester	7720527c95	Fix imsave test	2015-07-14 07:44:34 -05:00
Steven Silvester	e1596aef1b	Remove unclosed file guards	2015-07-14 07:44:34 -05:00
Steven Silvester	3272b85f86	Do not let PIL handle the file handle	2015-07-14 07:44:34 -05:00
Steven Silvester	a939eb4ce6	Use a container and pip cache ... Use container and pip cache Add the sudo calls back in Try removing sudo and the tk install Skip show() call in novice doctest Try not building docs and no libqt4-dev Try the optional installs right away Do not install PyQt4 or imread Try without libfreeimage Try and install libfreeimage outside of root Another attempt at libfreeimage Yet another attempt at libfreeimage Use the travis whitelist Try adding the sudo command Try and build the docs Install scikit-image first Restore full build functionality Fix whitespace Remove unused tk import	2015-07-13 21:22:44 -05:00
Josh Warner	17b882aae5	Merge pull request #1565 from blink1073/viewer-ax ... ENH: Allow viewer plot plugin to have tools.	2015-07-12 15:24:55 -05:00
Steven Silvester	09c8a84a54	Merge pull request #1518 from stefanv/relative_imports ... Consistently use relative imports	2015-07-12 14:41:06 -05:00
Steven Silvester	3bfd51cbe4	Merge pull request #1590 from jjhelmus/faster_tests ... Faster Unit Tests	2015-07-12 14:38:25 -05:00
Josh Warner	81d89b5518	Merge pull request #1598 from stefanv/bug/line_aa_horiz_vert ... FIX: Fix and clean up anti-aliased line drawing	2015-07-12 12:27:33 -05:00