Skip to content

update all headers#1088

Merged
richardjgowers merged 1 commit intodevelopfrom
update-citation
Nov 29, 2016
Merged

update all headers#1088
richardjgowers merged 1 commit intodevelopfrom
update-citation

Conversation

@kain88-de
Copy link
Copy Markdown
Member

@kain88-de kain88-de commented Nov 27, 2016

Fixes #993, #1002

I updated the licence headers using the script from @tylerjereddy. Updating the old PR wasn't an option due to rebase errors.

I noticed that the encore license headers aren't changed by the script. The whole encore package is licensed under GPLv3 with wrong time marks for the copyright and authors. The whole code in encore is only attributed to @wouterboomsma and @mtiberti though gitlog also shows at least one other constributor @tbengtsen. The GPL3 is actually a problem since the licenses are not backwards compatible it is ok for the encore parts to use MDAnalysis but not the other way around. The easiest solution to this would be if we can change encore to GPLv2 like the rest of MDAnalysis.

PR Checklist

  • [ ] Tests?
  • [ ] Docs?
  • [ ] CHANGELOG updated?
  • Issue raised/referenced?

@tylerjereddy
Copy link
Copy Markdown
Member

My impression is that the script was working well, but maybe not quite perfectly, so we should check the results carefully (this is rather obvious given the number of files changed).

@richardjgowers
Copy link
Copy Markdown
Member

richardjgowers commented Nov 27, 2016 via email

@kain88-de
Copy link
Copy Markdown
Member Author

@richardjgowers the script didn't check for exact matches of the old so that should be fine. I also did a manual check of the files touched shown with git log --numstat ..develop. With that I found the new Atomgroups file. Other then that everything was found.

@wouterboomsma
Copy link
Copy Markdown
Contributor

@kain88-de Should be no problem to change Encore to GPLv2. I'll just check with the others to make sure.

@wouterboomsma
Copy link
Copy Markdown
Contributor

@kain88-de Everyone is OK with the change to GPLv2. Can this change be done automatically by the script, or do we manually need to change the headers?

@kain88-de
Copy link
Copy Markdown
Member Author

@wouterboomsma I would then modify the script to also change all encore headers to the default headers. I can't script everything because you have comments about the license also in the docs. But not that many files so it's doable.

@richardjgowers richardjgowers merged commit bff425c into develop Nov 29, 2016
@richardjgowers richardjgowers deleted the update-citation branch November 29, 2016 10:45
abiedermann pushed a commit to abiedermann/mdanalysis that referenced this pull request Jan 5, 2017
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.

4 participants