2009/10/12 Stéfan van der Walt <stefan@sun.ac.za>
2009/10/12 Ralf Gommers <ralf.gommers@googlemail.com>:
Thanks. I've fixed a test that broke due to the io -> collection rename, and added dtype keywords to imread and MultiImage. Defaults to None, which keeps the current behavior.
Can you pull those changes as well?
Thanks, done (will push soon).
In the future, it may be easier not to merge with the master branch. I'm still figuring out the best way to do this, but I think that will be easier since I can then just merge your branch, instead of cherry picking out the changes.
Hmm, not sure how else I would have fixed that test, since it only broke after you renamed io.py in the master branch. Why did you have to cherry pick, instead of just merging back my imgcollection branch into your master? Disclaimer: I am also quite new to this way of doing things. Cheers, Ralf
Thanks! Stéfan