Skip to content

add modes for extract_array to return fixed size - #3727

Merged
wkerzendorf merged 3 commits into
astropy:masterfrom
hamogu:fix_3333_again
Apr 28, 2015
Merged

wkerzendorf merged 3 commits into
astropy:masterfrom
hamogu:fix_3333_again

Conversation

@hamogu

@hamogu hamogu commented Apr 26, 2015

Copy link
Copy Markdown
Member

See extensive discussion in #3333

@wkerzendorf

Copy link
Copy Markdown
Member

@hamogu Thanks for the "rebase"! It's still failing some tests - can you have a look?

@hamogu

hamogu commented Apr 27, 2015

Copy link
Copy Markdown
Member Author

Should be fixed now. Was a copy & paste error...
Test's running again.
I've also googled and looked up some more git-fu that would have allowed me to continue with the old PR, but too late for now.

@wkerzendorf

Copy link
Copy Markdown
Member

@hamogu It's still failing some tests. can you have another look.

@astrofrog

Copy link
Copy Markdown
Member

Just a couple of sphinx warnings:

/home/travis/build/astropy/astropy/build/lib.linux-x86_64-2.7/astropy/nddata/utils.py:docstring of astropy.nddata.extract_array:21: WARNING: Block quote ends without a blank line; unexpected unindent.
/home/travis/build/astropy/astropy/build/lib.linux-x86_64-2.7/astropy/nddata/utils.py:docstring of astropy.nddata.utils.extract_array:21: WARNING: Block quote ends without a blank line; unexpected unindent.

@astrofrog astrofrog added this to the v1.1.0 milestone Apr 27, 2015
@wkerzendorf

Copy link
Copy Markdown
Member

@astrofrog I just saw that.

Comment thread astropy/nddata/utils.py Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hamogu -- if I had to guess, the sphinx warning is coming from here (or, really, from the two lines above it), because the indentation changes in this section.

@hamogu

hamogu commented Apr 28, 2015

Copy link
Copy Markdown
Member Author

Seems that I finally caught all the typos. Thanks for pointing them out to me and thanks for your support through this long discussion.

I guess I should have found the remaining typos myself, but I have to admit that I have gotten a little frustrated over this PR, so I did not try to build e.g. local sphinx docs and instead just uploaded so that Travis can do that work for me. Please don't make me rebase this again!

@mwcraig

mwcraig commented Apr 28, 2015

Copy link
Copy Markdown
Member

It will get merged once @wkerzendorf is back online. Future NDData PRs should go more smoothly, thanks again for getting this working!

wkerzendorf added a commit that referenced this pull request Apr 28, 2015
add modes for `extract_array` to return fixed size
@wkerzendorf
wkerzendorf merged commit 1b4795a into astropy:master Apr 28, 2015
@wkerzendorf

Copy link
Copy Markdown
Member

Thanks @hamogu!

Comment thread CHANGES.rst

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"extract array" -> "extract_array"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing this!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants