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

LIC : change license from GPL -> 3 clause BSD #46

Merged
merged 1 commit into from
Feb 17, 2014

Conversation

tacaswell
Copy link
Member

They promised me cookies!

@nkeim I would like you to sign off on this in this thread before Dan pulls it out an over abundance of caution.

@nkeim
Copy link
Contributor

nkeim commented Jan 31, 2014

I heard that all the cool kids use Apache v2, and I'm trying to cut back on wheat products. But BSD is totally consistent with how I want to share this, so go for it.

p.s. Did you know that this commit also removes a bunch of superfluous whitespace?

@tacaswell
Copy link
Member Author

I did not realize about the white space, but I am not surprised. Due to matplotlib have pep8 conformance as part of their test suite I have my editors set up to delete trailing when I save.

@tacaswell
Copy link
Member Author

What are the pros of apache 2? On the permissive side of GPL I don't have a whole lot of differentiation.

@nkeim
Copy link
Contributor

nkeim commented Feb 2, 2014

It's basically BSD, but rewritten using newer, fancier lawyers. But the legal "gotchas" that Apache avoids are largely hypothetical, and of concern only if you are a top target for litigation. I'm starting to think that it's not worth switching. So unless you've changed your mind, I think you should go ahead and pull.

@tacaswell
Copy link
Member Author

sigh, this needs a rebase. I will try to do this tonight.

@danielballan
Copy link
Member

Maybe do a PEP8 storm first?

On Thu, Feb 6, 2014 at 11:16 AM, Thomas A Caswell
notifications@github.comwrote:

sigh, this needs a rebase. I will try to do this tonight.

Reply to this email directly or view it on GitHubhttps://github.com//pull/46#issuecomment-34339507
.

@tacaswell
Copy link
Member Author

in this PR or before I bother to rebase?

@danielballan
Copy link
Member

in a separate commit, at least

@tacaswell
Copy link
Member Author

rebased, but I did not strip the space changes.

@nkeim If this is a major problem for you I can do it, but I am currently being lazy......

@nkeim
Copy link
Contributor

nkeim commented Feb 17, 2014

@danielballan OK to merge? Otherwise Tom will have to rebase again...

@danielballan
Copy link
Member

Oh, I didn't realize the ball was in my court now. I will merge, consenting
to this license change.

On Sunday, February 16, 2014, Nathan Keim notifications@github.com wrote:

@danielballan https://github.com/danielballan OK to merge? Otherwise
Tom will have to rebase again...

Reply to this email directly or view it on GitHubhttps://github.com//pull/46#issuecomment-35221327
.

danielballan added a commit that referenced this pull request Feb 17, 2014
LIC : change license from GPL -> 3 clause BSD
@danielballan danielballan merged commit b7fcd84 into soft-matter:master Feb 17, 2014
@danielballan danielballan mentioned this pull request Feb 25, 2014
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.

3 participants