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

Update and add licenses #3470

Merged
merged 17 commits into from
Sep 15, 2023
Merged

Update and add licenses #3470

merged 17 commits into from
Sep 15, 2023

Conversation

AyanSinhaMahapatra
Copy link
Member

@AyanSinhaMahapatra AyanSinhaMahapatra commented Jul 26, 2023 •
edited
Loading

Reference: aboutcode-org/scancode-licensedb#37

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 📁
  • Looked for possible updates in documentation and added updates if applicable
  • Updated CHANGELOG.rst

@AyanSinhaMahapatra
Add new licenses and license modifications
c8d50a6 
- Add new licenses
- Add the category modification to ofl-1.1

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Fix faulty SPDX license keys
1b67455 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add missing SPDX license key modifications
17dd1a2 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra AyanSinhaMahapatra changed the title Update and add licenses Update and add licenses, fix sync script Jul 26, 2023
@AyanSinhaMahapatra AyanSinhaMahapatra force-pushed the update-license-rules branch 2 times, most recently from 176d2b0 to 17dd1a2 Compare July 26, 2023 15:16
@AyanSinhaMahapatra AyanSinhaMahapatra changed the title Update and add licenses, fix sync script Update and add licenses Jul 26, 2023
@AyanSinhaMahapatra
Add new licenses
f48998d 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
pombredanne
pombredanne requested changes Jul 27, 2023
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! here are some nits for your consideration.

src/licensedcode/data/licenses/gcc-exception-3.0.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/ncsa-httpd-1995.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/ofl-1.1.LICENSE Outdated Show resolved Hide resolved
src/licensedcode/data/licenses/aldor-public-2.0.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/slint-commercial-2.0.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/slint-royalty-free-1.0.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/npsl-exception-0.95.LICENSE Show resolved Hide resolved
@AyanSinhaMahapatra
Address feedback on #3470
18d63ac 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Deprecate hot-potato license
86a1ac4 
Deprecate the hot-potato license and add it as a proprietary
rule instead.

Reference: #3446
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add new licenses and updates
4da5f11 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add mit license reference rule for URL
60f3d5f 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Update license categories
829ec71 
Reference: #3438
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
pombredanne
pombredanne approved these changes Aug 7, 2023
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.

Some minor nits to consider. Please merge then!

src/licensedcode/data/licenses/proconx-modbus-rev4.LICENSE Show resolved Hide resolved
src/licensedcode/data/rules/paypal-sdk-2013-2016_1.RULE Outdated Show resolved Hide resolved
@AyanSinhaMahapatra
Add new rules for paypal sdk license
2a622cc 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add new and updated licenses
43cf2dc 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Merge branch 'develop' into update-license-rules
c79a086
@AyanSinhaMahapatra
Fix license clues bug
8e4278d 
The license clue detection step was in the wrong order for file
detections.

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Update proprietary rules as license clues
dda0eeb 
Reference: #3504
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add new rules and rule updates
16789e8 
Reference: #3494
Reference: #3499
Reference: #3498
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Regen test expectations and update clues detection
9128744 
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Add proprietary license rule
144d6ff 
Reference: #3507
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
pombredanne
pombredanne approved these changes Sep 15, 2023
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... some tests are not passing though

@AyanSinhaMahapatra
Copy link
Member Author

@pombredanne these were the heisenbugs, I've reran the tests, all green now.

@AyanSinhaMahapatra AyanSinhaMahapatra merged commit a916a6b into develop Sep 15, 2023
33 checks passed
@AyanSinhaMahapatra AyanSinhaMahapatra deleted the update-license-rules branch September 15, 2023 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@silverhook silverhook silverhook left review comments

@pombredanne pombredanne pombredanne approved these changes

@DennisClark DennisClark Awaiting requested review from DennisClark

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

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