Commit Graph

62 Commits

Author SHA1 Message Date
Steven Silvester 8122e26731 Add another file guard 2015-07-14 09:28:53 -05:00
Steven Silvester ef9c4d8d19 Fix handling of img_num=0 cases 2015-05-09 09:32:33 -05:00
Steven Silvester 62e82ccf49 Do not read in the whole array 2015-03-31 20:54:57 -05:00
Steven Silvester ad8c94fcaf Fix handling of non-gif and tiff files 2015-03-30 21:41:44 -05:00
Steven Silvester e531e57124 Only index tif and gif files in collection 2015-03-29 21:54:35 -05:00
Steven Silvester 73b1942751 Do not attempt to use _frame_index for exotic load_patterns 2015-03-23 15:35:17 -05:00
Steven Silvester a51d49abe6 Always use _find_images() 2015-03-21 09:31:05 -05:00
Steven Silvester 80555a2bdb Add a note to the docstring 2015-03-20 19:14:25 -05:00
Steven Silvester 45f21d3941 Fix handling of ImageCollection indexing and add test 2015-03-20 19:11:29 -05:00
Jonathan Helmus 78a0eb6b98 Implement appveyor builds
Implement Appveyor builds

initial test

Updated appveyor.yml

New nosetest call

With conda update conda

with pillow

without pillow

TST: Change case sensitivive JPG extension

Revert "TST: Change case sensitivive JPG extension"

This reverts commit 2deed7cc63736f7c6f0387bd37df4c6643c32847.

Trying with Python 2.7

Trying with version env

Trying again with variables

Testing on all Python versions

don't allow failures

Allow failure

Do not actually use tests

Ignore failing tests

Removed Python 2.6 test

Testing only Python 2.6

Testing out more sklearn like AppVeyor CI

Added install to pip

Add artifacts

Enabled all permutations

Disable 2.6, add PIL

Python 2.6, 2.7 only with PIL

Testing with variable dependencies

Allow failure with IF ELSE

With Python 3.4

Scikit-learn like appveyor CI

Fixing paths

Undo path fix

path fix single line

path fix single line 2

Using Miniconda

More path fixes

New wheelhouse link

Added pillow to requirements.txt

Added networkx to requirements.txt

Add testing of 32/64-bit Python 2.7 and 3.4 to matrix

Debugging Cython compile

Retry with all 4 builds

Updated install.ps1 file

Updated based on latest python-appveyor-demo

Debugging pip install

Specify numpy 1.8.1 until whl is uploaded to rackspace

Use skimage-wide requirements.txt file

Minor comment change to trigger build

Install wheel and then install from WHEELHOUSE

Install six from pip

Install networkx from pip

Install pyparsing from pip

Install pytz from pip

Try using just find-links

Install the binary dependencies first, then the rest

Add pillow to the install list

Fix appveyor.yml syntax

Fix requirements.txt syntax

Fix requirements.txt syntax again

Fix appveyor call to initial install

Fix appveyor call to initial install again

Fix appveyor call to initial install yet again

Install wheel

Install wheel first

Install wheel and nose in the appveyor requirements.txt

Fix Python3 version to match python ftp site

Only use cleanup decorator if available

Add debug info to multiimage test

More debugging information

Fix handling of path separators on Windows

Add another warning guard

Fix warning handling for non-windows

Do not use TkAgg as it may be causing alloc error

Clean up echo command

Allow for unclosed file warning

Fix spacing in echo command
2015-02-28 19:57:45 -06:00
Tim Seifert 4bdde3d2ae load correct _frame_index 2015-02-04 12:24:20 -06:00
Johannes Schönberger ee5c6fbeb2 Use relative imports in skimage files 2015-01-22 07:36:48 -05:00
Johannes Schönberger 3a1079a180 Misc PEP8 fixes 2014-12-14 02:56:14 +01:00
Steven Silvester a4a628b529 Fix file indexing in ImageCollection 2014-12-12 09:38:48 -06:00
Steven Silvester ad3939784c Indentation fix 2014-11-07 15:23:38 +02:00
Steven Silvester b5a988a52f Close the image file pointer when done. 2014-11-07 15:22:20 +02:00
Steven Silvester 0d76827734 Allow keyword arguments to imread 2014-11-07 15:22:20 +02:00
Steven Silvester 502f6af481 Pep8 cleanup 2014-11-07 15:22:19 +02:00
Steven Silvester 76fc909b62 Finish merging multiimage capability into collections 2014-11-07 15:22:19 +02:00
Steven Silvester b4838c3bd9 Fix failing tests 2014-11-07 15:22:19 +02:00
Steven Silvester d27fadb5cf Avoid circular import 2014-11-07 15:22:19 +02:00
Steven Silvester 305abf6d0c Change MultiImage to use new imread. 2014-11-07 15:22:19 +02:00
Steven Silvester 4298b8babc Allow multiple frames in PIL data in imread 2014-11-07 15:22:19 +02:00
Steven Silvester 39d9dcf20e Fix implementation of pil_to_ndarray in MultiImage 2014-11-07 15:22:19 +02:00
Steven Silvester 93c6d010e6 Use pil_to_ndarray to load PIL images 2014-11-07 15:22:19 +02:00
Steven Silvester 9a126e7009 Add a comment about reading in order 2014-11-07 15:22:19 +02:00
Steven Silvester 945e163867 Add animated gif, a test for it, and tests without conserve_memory.
Add animated gif, and a test for it, plus tests without conserve_memory

Add the gif file
2014-11-07 15:22:18 +02:00
Steven Silvester 49a92482cb Cleanup 2014-11-07 15:22:18 +02:00
Steven Silvester caaf37ec0c Fix implementation errors 2014-11-07 15:22:18 +02:00
Steven Silvester 09e6439310 Update multi_image test and install tifffile for travis. 2014-11-07 15:22:18 +02:00
Steven Silvester 732c9c37cc Add tifffile support for MultiImage 2014-11-07 15:22:18 +02:00
Steven Silvester a70a4933aa Fix implementation errors 2014-11-07 15:22:18 +02:00
Steven Silvester e0e4fe26f1 Add tifffile support for MultiImage 2014-11-07 15:22:18 +02:00
cgohlke 5403e7a61e Use os.pathsep to sepatate multiple ImageCollection load_pattern
The colon `:` does not work on Windows as it can be part of a path
2014-03-10 22:50:00 -07:00
Tony S Yu 25e349d416 Remove outdated function 2014-01-14 23:15:45 -06:00
Tony S Yu 07f2656975 Factor out function injection 2014-01-14 23:09:27 -06:00
Tony S Yu 19102510ce Move wrapper function 2014-01-14 23:09:27 -06:00
Tony S Yu 0f78de46e5 Add dynamic creation of imread_collection function 2014-01-14 23:09:26 -06:00
Johannes Schönberger 2e7f14d2d0 Fix multi image doctest 2013-11-03 19:14:58 +01:00
Stefan van der Walt eb6867cfe2 Make six an external dependency. 2013-10-27 14:06:26 +02:00
Stefan van der Walt a1adfa8d54 Correctly check for string type. 2013-06-29 10:17:41 -05:00
François Boulogne eb9de1d7eb MIN: use print() instead of print 2013-06-12 21:16:23 +02:00
Johannes Schönberger 16863535eb Re-enable plots in doc strings and generate PDF images for them 2013-03-13 10:59:26 +01:00
Johannes Schönberger 0324737c47 Fix some doc strings for latex docs 2013-03-12 09:39:42 +01:00
Andreas Mueller 6546460f47 COSMIT some pep8 2012-09-30 15:53:33 +01:00
Tony S Yu 0504392fd5 DOC: Fix doctests in io collection module 2012-09-11 23:36:12 -04:00
Stefan van der Walt b1139c724d DOC: Fix typos in see-also references. 2012-08-13 12:02:32 -07:00
Tony S Yu a05c3c6637 DOC: Add note about ImageCollection slicing.
Also, clean up some whitespace issues.
2012-08-05 17:44:49 -04:00
Tony S Yu 816d6e319a Merge pull request #221 from jjhelmus/imagecollection_slicing
Fix import conflicts:
	skimage/io/collection.py
2012-08-05 17:41:29 -04:00
Jonathan Helmus 03d037d044 ImageCollection now slices like other iterables 2012-07-25 11:11:25 -04:00