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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to SPDX license list 3.24.0 #3795

Merged
merged 6 commits into from
Jun 10, 2024
Merged

Update to SPDX license list 3.24.0 #3795

merged 6 commits into from
Jun 10, 2024

Conversation

AyanSinhaMahapatra
Copy link
Member

@AyanSinhaMahapatra AyanSinhaMahapatra commented Jun 5, 2024 •
edited by pombredanne
Loading

Reference: #3787
Reference: https://github.com/spdx/license-list-XML/releases/tag/v3.24.0

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
Update to SPDX license list 3.24.0
31925f2 
Reference: #3787
Reference: https://github.com/spdx/license-list-XML/releases/tag/v3.24.0
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add reviewed updates for SPDX licenses from 3.24.0
182174b 
Reference: #3787
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add more updates for SPDX license list 3.24.0
71563ba 
Reference: #3787
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Copy link
Member Author

@DennisClark this is ready for your initial review, see 31925f2 where we had also license detections info for license texts which were not exact matches.

DennisClark
DennisClark requested changes Jun 5, 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 Please see my inline comments on some of the licenses with suggested changes; otherwise, everything else is approved.

@AyanSinhaMahapatra
Copy link
Member Author

@DennisClark thanks! I've updated all the licenses accordingly from your feedback.

pombredanne
pombredanne requested changes Jun 6, 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.

Thanks! There are a few minor adjustments needed IMHO.

src/licensedcode/data/licenses/any-osi.LICENSE Outdated Show resolved Hide resolved
src/licensedcode/data/licenses/any-osi.LICENSE Show resolved Hide resolved
src/licensedcode/data/rules/any-osi_1.RULE Show resolved Hide resolved
src/licensedcode/data/rules/fftpack-2004_2.RULE Show resolved Hide resolved
src/licensedcode/data/rules/free-unknown_112.RULE Outdated Show resolved Hide resolved
src/licensedcode/data/rules/license-clue_any-osi_1.RULE Outdated Show resolved Hide resolved
@AyanSinhaMahapatra
Adress review comments and fix test failures
61faf4a 
There are suggestions from @DennisClark and @pombredanne

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Copy link
Member Author

@pombredanne Thanks for the feedback, I've resolved them all. Ready for review again!

pombredanne
pombredanne approved these changes Jun 8, 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
Copy link
Member

we just need a changelog entry

@AyanSinhaMahapatra AyanSinhaMahapatra linked an issue Jun 10, 2024 that may be closed by this pull request
Synchronize scancode licenses with SPDX license list 3.24.0 #3787
Closed
pombredanne and others added 2 commits June 10, 2024 20:42
@pombredanne @AyanSinhaMahapatra
Update CHANGELOG.rst
5e3a675 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Minor updates on licenses
efd5766 
These were added from @DennisClark

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Copy link
Member Author

Thanks for your reviews and updates @pombredanne @DennisClark, now merging!

@AyanSinhaMahapatra AyanSinhaMahapatra merged commit e166626 into develop Jun 10, 2024
29 of 34 checks passed
@AyanSinhaMahapatra AyanSinhaMahapatra deleted the update-spdx-license-list-3.24 branch June 10, 2024 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DennisClark DennisClark DennisClark requested changes

@pombredanne pombredanne pombredanne approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Synchronize scancode licenses with SPDX license list 3.24.0
3 participants
@AyanSinhaMahapatra @pombredanne @DennisClark