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

Inputs to render function are converted to float #4681 #4697

Merged
merged 2 commits into from
May 12, 2016
Merged

Inputs to render function are converted to float #4681 #4697

merged 2 commits into from
May 12, 2016

Conversation

aniketk21
Copy link
Contributor

@eteq @patti out and coords are converted to float. Please suggest any changes. #4681

@pllim pllim added the modeling label Mar 15, 2016
@aniketk21
Copy link
Contributor Author

@eteq @patti Please review.

@bmorris3
Copy link
Contributor

Looks good. I'm going to wait on a response from @eteq and @patti to double check that the coords array should be forced to an array.

@patti
Copy link
Contributor

patti commented Mar 24, 2016

@aniketk21 Looks good to me, but the if statements are redundant with those below and can be merged. I'm effectively off the grid for the next month, so I'm going to be slow to reply. If @eteq is happy, I'm happy.

@aniketk21
Copy link
Contributor Author

@patti I'll merge them.

@aniketk21
Copy link
Contributor Author

Should I update the docs and add a changelog?

@pllim
Copy link
Member

pllim commented Mar 25, 2016

Maybe a change log.

@aniketk21
Copy link
Contributor Author

@pllim Under which version should I add a change log?

@pllim
Copy link
Member

pllim commented Mar 25, 2016

That is a question for your mentor. Is it @eteq ?

@aniketk21
Copy link
Contributor Author

@eteq Under which version should I add a change log?

@eteq
Copy link
Member

eteq commented Apr 5, 2016

@aniketk21 - Lets call it 1.2, as I said in #4681. if it's a change in behavior it normally has to go in the next "major" version. So it should be mentioned both in the modeling section and as an "API change" (it's worth noting that it's a change to reflect the fact that this was the intent, but it was never clearly stated as far as I know in the docs, so it's not a bug per se but rather an implementation oversight).

@aniketk21
Copy link
Contributor Author

I'm not sure why the build failed. Maybe it happened because I did git fetch astropy in the render-4681 branch by mistake. What should I do now?

@bsipocz
Copy link
Member

bsipocz commented Apr 11, 2016

@aniketk21 - There are conflicts, thus the ci can't start, you need to rebase your branch on top of the latest master.

@@ -46,6 +46,8 @@ New Features
- ``astropy.modeling``

- Added the fittable=True attribute to the Scale and Shift models with tests. [#4718]
- Inputs (``coords`` and ``out``) to ``render`` function in ``Model`` are
Copy link
Member

Choose a reason for hiding this comment

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

Remove this duplicate change log entry.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay, thanks!

@pllim
Copy link
Member

pllim commented Apr 11, 2016

Also, would be nice to squash the commits into one before merge, given that there are only effectively 2 lines of new codes, which do not justify 4 different commits.

git rebase -i HEAD~4

@aniketk21
Copy link
Contributor Author

@pllim I've squashed all commits into one.

@pllim
Copy link
Member

pllim commented Apr 11, 2016

Thanks, @aniketk21 !

Looks good to me as well. So, the final question is, "Are you happy, @eteq ?"

@astrofrog
Copy link
Member

@aniketk21 - could you rebase again on the latest master version?

Inputs to render function are converted to float #4681

Removed whitespace on line 1122 #4681

Merged conversion to float

Added change log

Removed duplicate change log entry
@aniketk21
Copy link
Contributor Author

@astrofrog rebased on the latest master.

@eteq
Copy link
Member

eteq commented May 12, 2016

I am happy ;) Merging!

@eteq eteq merged commit dc49658 into astropy:master May 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants