-
Notifications
You must be signed in to change notification settings - Fork 12
Conversation
The license notices can be removed from the docstrings, but they should be moved to the top of the file and commented out with ´#´. This way, they are not part of the sphinx documentation, but still there and license can be checked recursively with |
Yep, that's what I meant. You can see a suggestion of what I think it should look like in ipi/utils/depend.py. I just did not want to do all the editing before it gets the blessing of @ceriottm. I think docstring first, license info second is better, but the other way around could also work. |
I agree with this. A few remarks:
|
Conflicts: ipi/utils/nmtransform.py
|
@ceriottm, can I please get your input on this? I would like to merge it as soon as possible so that I don't have to maintain it in sync with master. Basically the main thing is the new license block, the rest can be discussed separately. |
Apply the same modifications as before to new code from master. Conflicts: ipi/engine/simulation.py ipi/utils/io/README ipi/utils/io/__init__.py
On 15 June 2015 at 02:22, Ondrej Marsalek [email protected] wrote:
Copyright (C) 2014-2015, The i-PI DevelopersSee LICENSE for detailed license information
|
Minimal copyright notice sounds good, will prepare it like that. I would also put an explicit statement (one sentence) on licensing in the readme file. The AUTHORS file is customary for a list of developers, so I'd say go with that. I did not mean to say that I don't like the Regarding dual licensing. The beginning of the accepted answer below suggests that having GPL as well allows derivative work to also use GPL, which is not possible with MIT. Anyway, that's for later, I would say. The copyright notice does not depend on it. |
So in this branch, I will remove the boilerplate from docstrings and add the shorter copyright notice as a comment block under the docstring. Then we are ready to merge. Sounds good? |
This is what I would use (example in depend.py):
|
I pointed out that GPL for the socket implementation is not the best idea as it cannot be used in non-GPLed programs with simple copy&paste and adopting to their code base as it would make the whole code base GPL. One alternative would be LGPL for that part, but I think MIT is even more permissive and should be used at least for that part of the code. I didn't know, that you want to release the whole code under MIT. Maybe GPL would be better, so that anyone who makes changes to the code must also publish it? (Exactly what I want to avoid with MIT for the socket part...) |
As @ondrej pointed out, the rationale for dual licensing was to allow On 21 June 2015 at 22:45, Thomas Spura [email protected] wrote:
|
Let's continue under #67 and close this pull request once I put in the new copyright block. |
Also some minor style tweaks at the top of the files.
Also some minor style tweaks.
This is ready for a merge as far as I am concerned. |
green lights! On 27 June 2015 at 01:52, Ondrej Marsalek [email protected] wrote:
|
Clean up docstrings and update copyright boilerplate
I moved and merged documentation text from README files to package
__init__.py
files and from module docstrings to the classes and functions themselves. This makes automatically extracted documentation better and removes lists of stuff that need to be maintained by hand. I already found several places where it was out of sync and it would only be worse.If we also want to remove the license notices from the docstrings, as I think we should, do not merge it.
Fixes #46.