Repository navigation
Conversation
|
This will probably have a merge conflict with #3525 -- just a note in case we want to merge in a particular order. |
|
Changelog entry nag, and this can be merged :D |
|
Sure -- I wouldn't mind getting confirmation from @martynbristow that this works for him first, as well. |
|
Hello I’m just trying to check it through
|
|
@mdboom - works for me, thanks! After doing this I get the expected exception (because the data file is really malformed for the |
|
Yeah brilliant
|
|
As feared, this needs to be rebased now. |
|
@mdboom Can you rebase this? If you're not around no problem though, I'll just merge by hand. |
|
Rebased. |
|
Oh, I think this broke as a result of the changes I made to the tests in #3525. |
There was a problem hiding this comment.
This needs to be changed to pass in read_tab as an argument, as it is now a fixture--somewhat odd I admit. Sorry 'bout that.
|
FWIW I fixed that up and rebased it--the new branch is testing here: https://travis-ci.org/embray/astropy/builds/53374609 Looks like it should pass, then I'll merge. |
|
Manually merged in 00d223f. |
Conflicts: astropy/io/ascii/src/tokenizer.c
|
Thanks! |
|
Thanks both!! |
Conflicts: astropy/io/ascii/src/tokenizer.c
Conflicts: astropy/io/ascii/src/tokenizer.c
Hopefully addresses #3545.