Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docupdates #148

Merged
merged 5 commits into from
Jul 23, 2014
Merged

Docupdates #148

merged 5 commits into from
Jul 23, 2014

Conversation

crawfordsm
Copy link
Member

Updates to docs and readme files including an installation instructions

@mwcraig
Copy link
Member

mwcraig commented Jul 23, 2014

I found the next-to-last problem -- sphinx doesn't like the np.array in the default for f_conv in cosmicray_lacosmic. To avoid a collision, I'll plan to fix that up after any changes you make as a result of #130.

@mwcraig
Copy link
Member

mwcraig commented Jul 23, 2014

Actually, do you mind if I merge this in? Then we are both working from the same base...the only error right now is a doc building one.

crawfordsm added a commit that referenced this pull request Jul 23, 2014
@crawfordsm crawfordsm merged commit 8e261f2 into astropy:master Jul 23, 2014
@crawfordsm crawfordsm deleted the docupdates branch July 23, 2014 15:24
@mwcraig
Copy link
Member

mwcraig commented Jul 23, 2014

Just a heads up, I'm about to push a change directly to master that updates astropy_helpers to v 0.4 (this is not as painless and transparent as it should be, or I'm doing it wrong).

Could you please rebase onto that?

@mwcraig
Copy link
Member

mwcraig commented Jul 23, 2014

ok, push is done

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants