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

DOC: Use SPDX license expressions with correct license #17238

Merged
merged 2 commits into from Sep 3, 2020

Conversation

pombredanne
Copy link
Contributor

After a check I found that tools/npy_tempita/license.txt license is an MIT license and not a "BSD Derived" as reported.
I also propose to use SPDX license identifiers and license expressions for improved clarity and update the file accordingly.

This is based on a scan I ran after an original report at nexB/scancode-toolkit#2189

Reported-by: Frank Viernau frank.viernau@here.com
Signed-off-by: Philippe Ombredanne pombredanne@nexb.com

tools/npy_tempita/license.txt license is MIT not a "BSD Derived"
Also use SPDX license identifiers and expressions for clarity

Based on original report at nexB/scancode-toolkit#2189

Reported-by: Frank Viernau <frank.viernau@here.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@charris
Copy link
Member

charris commented Sep 3, 2020

LGTM, but I am unfamiliar with SPDX.

For details, see doc/sphinxext/LICENSE.txt

Name: scipy-sphinx-theme
Files: doc/scipy-sphinx-theme/*
License: 3-clause BSD, PSF and Apache 2.0
License: BSD-3-clause AND PSF-2.0 AND Apache-2.0
Copy link
Member

Choose a reason for hiding this comment

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

Out of curiosity, why the changed use of "AND"?

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

The specs seem to spell it BSD-3-Clause with a capital c, but I guess that just doesn't matter, if the auto-tool doesn't complain.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@seberg Case corrected with b769d83

Also note: I did not introduce change to the format of that file which is essentially a Debian machine readable copyright file, hence why I did not use SPDX-License-Identifier

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@charris you wrote:

Out of curiosity, why the changed use of "AND"?

because the three licenses apply there https://github.com/scipy/scipy-sphinx-theme/blob/59c27fdde3ec4c78eb93b5e375d203ec5707382a/LICENSE.txt

@seberg seberg changed the title Use SPDX license expressions with correct license DOC: Use SPDX license expressions with correct license Sep 3, 2020
Reported-by: Sebastian Berg <sebastian@sipsolutions.net>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@seberg
Copy link
Member

seberg commented Sep 3, 2020

Thanks @pombredanne, no point in waiting for the tests on this.

@seberg seberg merged commit 077427b into numpy:master Sep 3, 2020
@pombredanne pombredanne deleted the patch-1 branch September 3, 2020 15:44
charris pushed a commit to charris/numpy that referenced this pull request Sep 3, 2020
* Use SPDX license expressions with correct license

tools/npy_tempita/license.txt license is MIT not a "BSD Derived"
Also use SPDX license identifiers and expressions for clarity

Based on original report at nexB/scancode-toolkit#2189

Reported-by: Frank Viernau <frank.viernau@here.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

* Use correct case for BSD licenses identifers

Reported-by: Sebastian Berg <sebastian@sipsolutions.net>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@charris charris removed the 09 - Backport-Candidate PRs tagged should be backported label Sep 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants