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

Support SPDX License List 3.23 #3653

Merged
merged 5 commits into from
Feb 20, 2024
Merged

Support SPDX License List 3.23 #3653

merged 5 commits into from
Feb 20, 2024

Conversation

AyanSinhaMahapatra
Copy link
Member

@AyanSinhaMahapatra AyanSinhaMahapatra commented Feb 14, 2024 •
edited
Loading

Reference: aboutcode-org/scancode-licensedb#49

Tasks

  • Reviewed contribution guidelines
  • PR is descriptively titled 📑 and links the original issue above 🔗
  • Tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR
    Run tests locally to check for errors.
  • Commits are in uniquely-named feature branch and has no merge conflicts 📁
  • Updated documentation pages (if applicable)
  • Updated CHANGELOG.rst (if applicable)

@AyanSinhaMahapatra
Add license/rule modifications from SPDX 3.23
2c85eb6 
Reference: aboutcode-org/scancode-licensedb#49
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add new licenses from SPDX license list 3.23
0a66e2e 
Referemce: aboutcode-org/scancode-licensedb#49
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Update licenses/rules from SPDX License list 3.23
74d42f5 
Reference: aboutcode-org/scancode-licensedb#49
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Regen tests for SPDX license list 3.23
5a39c21 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
pombredanne
pombredanne approved these changes Feb 19, 2024
View reviewed changes
Copy link
Member

@pombredanne pombredanne left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks

pombredanne
pombredanne approved these changes Feb 19, 2024
View reviewed changes
Copy link
Member

@pombredanne pombredanne left a comment

Choose a reason for hiding this comment

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

Here are a few nits on copyrights... and good to merge otherwise!
Thanks

src/licensedcode/data/rules/dec-3-clause_1.RULE Outdated Show resolved Hide resolved
src/licensedcode/data/rules/caldera-no-preamble_1.RULE Outdated Show resolved Hide resolved
src/licensedcode/data/rules/other-permissive_242.RULE Show resolved Hide resolved
src/licensedcode/data/rules/pnmstitch_1.RULE Outdated Show resolved Hide resolved
src/licensedcode/data/rules/softsurfer_2.RULE Outdated Show resolved Hide resolved
src/licensedcode/data/rules/sun-ppp_1.RULE Outdated Show resolved Hide resolved
src/licensedcode/data/rules/umich-merit_1.RULE Show resolved Hide resolved
src/licensedcode/data/rules/xkeyboard-config-zinoviev_1.RULE Outdated Show resolved Hide resolved
@AyanSinhaMahapatra AyanSinhaMahapatra modified the milestones: v32.2, v32.1 Feb 19, 2024
pombredanne
pombredanne requested changes Feb 20, 2024
View reviewed changes
Copy link
Member

@pombredanne pombredanne left a comment

Choose a reason for hiding this comment

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

Please our texts as-is and add add new rules with the SPDX texts rather than modifying our texts.

src/licensedcode/data/licenses/drl-1.1.LICENSE Outdated Show resolved Hide resolved
src/licensedcode/data/licenses/hdparm.LICENSE Outdated Show resolved Hide resolved
src/licensedcode/data/licenses/paul-mackerras.LICENSE Outdated Show resolved Hide resolved
src/licensedcode/data/licenses/softsurfer.LICENSE Outdated Show resolved Hide resolved
src/licensedcode/data/licenses/tgppl-1.0.LICENSE Outdated Show resolved Hide resolved
@AyanSinhaMahapatra
Address review comments
125c1df 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Copy link
Member Author

@pombredanne thanks for the comments, updated them to preserve the original texts.

DennisClark
DennisClark approved these changes Feb 20, 2024
View reviewed changes
Copy link
Member

@DennisClark DennisClark left a comment

Choose a reason for hiding this comment

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

@AyanSinhaMahapatra I tried really hard to find problems, but did not succeed! This looks ready to go, thanks.

@AyanSinhaMahapatra
Copy link
Member Author

Thanks @DennisClark @pombredanne , merging!

@AyanSinhaMahapatra AyanSinhaMahapatra merged commit 9d466d3 into develop Feb 20, 2024
32 of 34 checks passed
@AyanSinhaMahapatra AyanSinhaMahapatra deleted the update-spdx-license-list branch February 20, 2024 19:06
@AyanSinhaMahapatra AyanSinhaMahapatra mentioned this pull request Feb 26, 2024
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DennisClark DennisClark DennisClark approved these changes

@pombredanne pombredanne Awaiting requested review from pombredanne

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v32.1
Development

Successfully merging this pull request may close these issues.
3 participants
@AyanSinhaMahapatra @pombredanne @DennisClark