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

Update license information #75

Merged
merged 2 commits into from
Sep 13, 2021
Merged

Update license information #75

merged 2 commits into from
Sep 13, 2021

Conversation

BoxiLi
Copy link
Member

@BoxiLi BoxiLi commented Jul 11, 2021

Same as qutip/qutip#1579, remove the license in every single file and update the LICENSE file accordingly. I'll merge this after we come to an agreement with that PR.

@jakelishman
Copy link
Member

As far as I'm aware, we are in agreement in the main PR, since I got Nathan's tick. I meant to merge it then, but I wanted to wait til I'd finished work for the day, and then I just forgot. I can do it now.

@BoxiLi
Copy link
Member Author

BoxiLi commented Jul 11, 2021

Ok, great, thanks! I'll still wait for a few approvals on this PR first.

Copy link
Member

@jakelishman jakelishman left a comment

Choose a reason for hiding this comment

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

I think there may be some slightly different issues that need addressing for the licensing here because qutip-qip is built from QuTiP code, and the admin team don't own the copyright entirely, so I think we may actually need to include a copyright notice acknowledging the original contributions of other QuTiP contributors.

BSD 3-Clause License

Copyright (c) 2020, QuTiP
Copyright (c) 2011 to 2021 inclusive, QuTiP developers and contributors.
Copy link
Member

Choose a reason for hiding this comment

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

Since qutip-qip is new, I'm not sure you can assert copyright from past years. Also, since a lot of code is migrated from QuTiP main, I think to be in compliance with the QuTiP licence, we may need a statement of attribution about that as well.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, maybe this can only be Copyright (c) 2020 to 2021 inclusive, QuTiP developers and contributors.

Copy link
Member Author

Choose a reason for hiding this comment

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

But indeed I'm not sure if we need to keep a different licence for those files migrated from qutip and those created new in qutip-qip.

Copy link
Contributor

@hodgestar hodgestar Jul 11, 2021

Choose a reason for hiding this comment

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

Since this is a QuTiP family package and this is a "fork" of a subset of qutip, I think it can keep the "2011 to 2021 inclusive" and the "QuTiP developers and contributors".

If the contributors were not the same we would write:

Copyright (c) 2021, QuTiP QIP developers and contributors.
Copyright (c) 2011 to 2021 inclusive, QuTiP developers and contributors.

because we need to retain the old copyright years and owners and add the new ones. Since they're the same, we can just merge them.

@jakelishman
Copy link
Member

I'm not certain on any of what I said, but that's my rough impression of how licensing works.

@BoxiLi
Copy link
Member Author

BoxiLi commented Jul 11, 2021

admin team don't own the copyright entirely, so I think we may actually need to include a copyright notice acknowledging the original contributions of other QuTiP contributors.

All the credits were kept during the separation of this repo, so their contributions are still there.

@BoxiLi BoxiLi merged commit 0cf9aba into qutip:master Sep 13, 2021
@BoxiLi BoxiLi added this to the qutip-qip-0.2.0 milestone Sep 14, 2021
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

3 participants