Commit Graph

19 Commits

Author SHA1 Message Date
Tony S Yu 6a751045f1 Un-revert commits added to test Travis CI failures 2013-12-07 01:04:40 -06:00
Tony S Yu c09f1bfd32 Revert previous 3 commits to test Travis CI failures. 2013-12-07 00:01:32 -06:00
Tony S Yu 99c5ba409a Slight clean up of tests 2013-12-06 23:43:56 -06:00
Stefan van der Walt eb6867cfe2 Make six an external dependency. 2013-10-27 14:06:26 +02:00
Stefan van der Walt 2b0f037422 Remove Image wrapper from io. Improve tags handling. 2013-08-21 17:46:38 +02:00
Stefan van der Walt a1adfa8d54 Correctly check for string type. 2013-06-29 10:17:41 -05:00
François Boulogne 84bff08601 fix import testing 2013-06-20 23:08:39 +02:00
Tony S Yu 53807d79a6 Merge pull request #233 from wilsaj:image-html-repr
Conflicts:
	skimage/io/tests/test_collection.py
2012-08-24 00:15:32 -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
tonysyu 71a518c8cf Merge pull request #226 from jni/jni-alphanumeric-sort
Sort files from a global pattern alphanumerically
2012-07-22 21:28:38 -07:00
Juan Nunez-Iglesias 699b5d9269 Add test coverage for alphabetic sort
alphanumeric_key should sort filenames correctly when they differ in
text, not just numbers.
2012-07-20 17:50:04 -05:00
Juan Nunez-Iglesias 9006c1dab3 Sort files from a global pattern alphanumerically
Users usually expect an alphanumeric sort, not lexicographic sort, on
their filenames. This is now the behaviour of ImageCollection.
2012-07-20 17:38:06 -05:00
Juan Nunez-Iglesias a61ac37ff2 Add concatenate() support for MultiImage
Previously we added the ImageCollection.concatenate function. This
updates MultiImage to have the same functionality, and moves the grunt
work to an outside function to avoid repetition.
2012-07-20 16:46:33 -05:00
wilsaj 70cf6cfba0 fix test so it looks for new Image class 2012-07-20 15:39:50 -05:00
Juan Nunez-Iglesias 62ce6f3ab5 Add test for ImageCollection.concatenate 2012-07-20 15:35:03 -05:00
Jonathan J. Helmus 5101aa2a38 added test for ImageCollection slicing 2012-07-20 15:23:25 -04:00
Andreas Mueller f7b3d8062c COSMIT pep8 2012-06-29 11:27:23 +02:00
Nelle Varoquaux 114cf44c77 Renamed scikits.image to skimage 2011-10-18 21:12:27 +02:00