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

Fix typo: 2010A&A...511A..52A -> 2010A&A...511A..52H #224

Merged
merged 2 commits into from
Mar 27, 2018
Merged

Fix typo: 2010A&A...511A..52A -> 2010A&A...511A..52H #224

merged 2 commits into from
Mar 27, 2018

Conversation

pdeiml
Copy link
Collaborator

@pdeiml pdeiml commented Mar 27, 2018

Fix of a bug in a input dataset file in commit
104296b

This bug has lead to wrong information in the input- and output index files.
Therefore a Update of the whole output folder is done in
7c1e0fe,
additionally the input index file is fixed.

7c1e0fe
is a quite large diff because 'make.py all' changed a lot in the existing files.
I think this is due to a missing update of the output collection after changing scripts which affect the output collection.

I can drop the second commit but I do need the fix of this at least in the index files for the next PR!

RTM

@pdeiml pdeiml changed the title Fixup of ref_ids Fixup of ref_id Mar 27, 2018
@cdeil
Copy link
Contributor

cdeil commented Mar 27, 2018

I can drop the second commit

Please do.

And in the future: please never add huge output folder updates to a PR that fixes something in the input folder.
Adding in related changes in the output folder is sometimes acceptable (but also not advised as it quickly leads to merge conflicts).
But adding a ton of changes to all the files that is completely unrelated is not.

Here, the diff you see for the output files is because you have an old version of Astropy (or the YAML package we use). Please update your Astropy and these differences should disappear for you locally.

@cdeil
Copy link
Contributor

cdeil commented Mar 27, 2018

I've applied an update to the output files in 939e3f3 .
Apparently I forgot to do that with the last gamma-cat PR, sorry.

But you see, now there's merge conflicts here in the output catalog files.
It's not possible to work with multiple PRs in parallel in gamma-cat if people commit unrelated changes to the output folder in PRs. That must be left up to the reviewer to apply them at the time of merging. Then we'll never have merge conflicts.

@pdeiml
Copy link
Collaborator Author

pdeiml commented Mar 27, 2018

Ok, I do not exactly get your point about PRs that change the output folder but ok :-)
I dropped the second commit but for #225 the output folder has to be updated!
Hence, please merge this PR and then do a 'make.py all' (or make.py collection) as a follow up commit.

@cdeil cdeil self-assigned this Mar 27, 2018
@cdeil cdeil changed the title Fixup of ref_id Fix typo: 2010A&A...511A..52A -> 2010A&A...511A..52H Mar 27, 2018
Copy link
Contributor

@cdeil cdeil left a comment

Choose a reason for hiding this comment

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

This looks good now, thanks!
I've updated the auto-generated files in d5f966a .
Merging this now.

@cdeil cdeil merged commit 38258c8 into gammapy:master Mar 27, 2018
@pdeiml pdeiml deleted the Update_Output branch March 27, 2018 17:41
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.

2 participants