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.

Sign up for GitHub

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

Jump to bottom

PR: Fix copyright for brand change and add explicit license type #122

Merged
merged 7 commits into from
Oct 3, 2017
Merged

PR: Fix copyright for brand change and add explicit license type #122

merged 7 commits into from
Oct 3, 2017

Conversation

goanpeca
Copy link
Contributor

@goanpeca goanpeca commented Sep 21, 2017 •
edited
Loading

Fixes #95

  • Changed to use (c) feels, more standard
  • Also added the line that describes the license type on all headers (BSD 3-Clause)
  • And changed all entries of Continuum on other places (setup.py etc...)

@goanpeca goanpeca self-assigned this Sep 21, 2017
goanpeca
goanpeca commented Sep 21, 2017
View reviewed changes
LICENSE.txt Outdated
@@ -11,7 +11,7 @@ Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

Neither the name of Continuum Analytics nor the names of any contributors
Neither the name of Anaconda, Inc nor the names of any contributors
Copy link
Contributor Author

@goanpeca goanpeca Sep 21, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

@csoja, @fpliger I just wanted to double check if this part of the license needs to be changed or it should be left as Continuum Analytics, do you happen to know?

Copy link
Contributor

Choose a reason for hiding this comment

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

Don't think we need to change all Continuum Analytics entries at this time... @csoja, can you confirm?

Copy link

@csoja csoja Sep 22, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

It would be good to update them to the latest - for a license though - it should look similar to the Anaconda EULA: https://docs.anaconda.com/anaconda/eula
copyright changes to Anaconda, Inc. Then, Continuum Analytics changed to Continuum Analytics, Inc. (dba Anaconda, Inc.). I would get Jeanie to review it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think the eula example is what we should follow for license as well. Seems the most comprehensive. I will wait on the check :-)

@goanpeca
Copy link
Contributor Author

@fpliger any comments?

@goanpeca
Copy link
Contributor Author

@havocp is there a reason why we pinned conda on appveyor to 4.1.12

https://github.com/Anaconda-Platform/anaconda-project/blob/master/appveyor.yml#L31 ?

@goanpeca goanpeca merged commit c33bf85 into anaconda:master Oct 3, 2017
@goanpeca goanpeca deleted the fix/copy branch October 3, 2017 18:26
@goanpeca goanpeca added this to the v0.8.1 milestone Oct 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@csoja csoja csoja left review comments

@fpliger fpliger Awaiting requested review from fpliger

Assignees

@goanpeca goanpeca

Labels
None yet
Projects
None yet
Milestone
v0.8.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@goanpeca @fpliger @csoja