Commit Graph

7280 Commits

Author SHA1 Message Date
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 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 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
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
Josh Warner 2690fef1db Merge pull request #1607 from blink1073/faster-travis
TST: Use new Travis containers for faster CI builds
2015-07-14 07:42:20 -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
Stefan van der Walt aa420d8589 Merge pull request #1606 from blink1073/fix-setup-numpy
Mimic the way scipy handles numpy in setup.py
2015-07-13 01:16:02 -05:00
Steven Silvester 09503cd168 Fix docstring 2015-07-12 22:27:41 -05:00
Steven Silvester 39b8198250 Fix typo 2015-07-12 22:26:07 -05:00
Steven Silvester 43168c60a6 Mimic the way scipy handles numpy in setup.py 2015-07-12 22:21:40 -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