Add new and improve existing licenses #3271

AyanSinhaMahapatra · 2023-02-22T22:37:39Z

This PR:

Updates the SPDX license list to version 3.20 Update SPDX license list to 3.20 #3263
Adds several new licenses.
It also refines detection rules and tests accordingly.

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 📁

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

* Add modifications to licenses where we have a new SPDX license for an already existing scancode license. Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

* Add new license files for licenses that were not present in scancode license list. Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Update license files with correct order of attributes. Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

@DennisClark

Add license data updates from @DennisClark Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

@DennisClark

Add new licenses from @DennisClark Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

AyanSinhaMahapatra

@DennisClark see comments for doubts that I had.

src/licensedcode/data/licenses/adacore-doc.LICENSE

src/licensedcode/data/licenses/iec-code-components-eula.LICENSE

src/licensedcode/data/licenses/jpl-image.LICENSE

src/licensedcode/data/licenses/ucar.LICENSE

src/licensedcode/data/licenses/hpnd-export-us.LICENSE

src/licensedcode/data/licenses/cfitsio.LICENSE

src/licensedcode/data/licenses/apple-academic-lisa-os-3.1.LICENSE

src/licensedcode/data/licenses/bsd-advertising-acknowledgement.LICENSE

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

pombredanne

Thanks!
Here is a first pass of review!

src/licensedcode/data/licenses/cfitsio.LICENSE

src/licensedcode/data/licenses/clips.LICENSE

src/licensedcode/data/licenses/cooperative-non-violent-6.0.LICENSE

src/licensedcode/data/licenses/cornell-lossless-jpeg.LICENSE

src/licensedcode/data/licenses/inria-linking-exception.LICENSE

src/licensedcode/data/licenses/jpl-image.LICENSE

src/licensedcode/data/licenses/kazlib.LICENSE

src/licensedcode/data/licenses/jpl-image.LICENSE

src/licensedcode/data/licenses/loop.LICENSE

pombredanne

Here is the last batch of review nit pickings.
We need to address the brian gladmann license issue.

src/licensedcode/data/licenses/object-form-exception-to-mit.LICENSE

src/licensedcode/data/licenses/offis.LICENSE

src/licensedcode/data/licenses/qpl-1.0-inria-2004.LICENSE

src/licensedcode/data/licenses/swi-exception.LICENSE

src/licensedcode/data/licenses/ucar.LICENSE

src/licensedcode/data/rules/sunpro_2.RULE

src/licensedcode/data/licenses/brian-gladman-3-clause.LICENSE

src/licensedcode/data/rules/x11-bitstream_5.RULE

tests/licensedcode/data/datadriven/external/fossology-tests/Dual-license/aes.h.yml

...iven/lic4/gpl-2.0-plus_and_gpl-2.0-plus_and_gpl-3.0-plus_and_lgpl-2.1-plus_and_other.txt.yml

@pombredanne

- Add updates based on feedback from @pombredanne and @DennisClark Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

pombredanne

Thanks! LGTM! there are two minor nits that you are free to ignore!

src/formattedcode/output_spdx.py

src/licensedcode/data/licenses/acm-sla.LICENSE

pombredanne · 2023-03-01T14:47:07Z

@AyanSinhaMahapatra in hindsights, I think this is OK to merge this for release in 32.x

pombredanne

You still need to update https://github.com/nexB/scancode-toolkit/blob/fca7b72ee5dd6a986ae00e97fedd0e3a97c469eb/src/scancode_config.py#L146 to 3.20

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

AyanSinhaMahapatra · 2023-03-01T15:02:08Z

@pombredanne bumped SPDX License list version to 3.20, thanks!

pombredanne

Thanks!

AyanSinhaMahapatra · 2023-03-07T15:33:30Z

All green and resolved, merging this!

AyanSinhaMahapatra added 7 commits February 22, 2023 17:49

Fix license list version value in spdx tv output #3257

c2269f3

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Restore old spdx license keys with scancode licenseref

e33bff1

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Add modifications from SPDX license list 3.20 #3263

c464411

* Add modifications to licenses where we have a new SPDX license for an already existing scancode license. Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Add new licenses from SPDX license list 3.20 #3263

f89e499

* Add new license files for licenses that were not present in scancode license list. Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Add updates in license rules from SPDX license list #3263

e1f821c

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Format LICENSE files correctly

e11af29

Update license files with correct order of attributes. Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Add license data updates

c6dfc2c

Add license data updates from @DennisClark Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

AyanSinhaMahapatra mentioned this pull request Feb 22, 2023

LicenseListVersion: 3.6 #3257

Closed

Add new licenses

7115096

Add new licenses from @DennisClark Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

AyanSinhaMahapatra force-pushed the update-spdx-license-list-to-3.20 branch from 0a4fbe6 to 7115096 Compare February 22, 2023 23:14

Fix invalid license key

d2f343c

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

AyanSinhaMahapatra force-pushed the update-spdx-license-list-to-3.20 branch from 4e5f898 to 040e548 Compare February 23, 2023 10:43

AyanSinhaMahapatra commented Feb 23, 2023

View reviewed changes

pombredanne reviewed Feb 24, 2023

View reviewed changes

src/licensedcode/data/licenses/apple-academic-lisa-os-3.1.LICENSE Outdated Show resolved Hide resolved

pombredanne reviewed Feb 24, 2023

View reviewed changes

src/licensedcode/data/licenses/bsd-advertising-acknowledgement.LICENSE Outdated Show resolved Hide resolved

AyanSinhaMahapatra force-pushed the update-spdx-license-list-to-3.20 branch from 040e548 to 5095c44 Compare February 24, 2023 09:13

Fix test expectations and address feedback

032550e

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

AyanSinhaMahapatra force-pushed the update-spdx-license-list-to-3.20 branch from 5095c44 to 032550e Compare February 24, 2023 09:16

pombredanne requested changes Feb 24, 2023

View reviewed changes

AyanSinhaMahapatra modified the milestones: v32.0, v32.1 Feb 27, 2023

AyanSinhaMahapatra force-pushed the update-spdx-license-list-to-3.20 branch from 2cfd879 to f2167ee Compare February 28, 2023 14:51

Add feedback on license additions

697d2a2

- Add updates based on feedback from @pombredanne and @DennisClark Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

AyanSinhaMahapatra force-pushed the update-spdx-license-list-to-3.20 branch from f2167ee to 697d2a2 Compare March 1, 2023 13:28

pombredanne approved these changes Mar 1, 2023

View reviewed changes

src/formattedcode/output_spdx.py Outdated Show resolved Hide resolved

src/licensedcode/data/licenses/acm-sla.LICENSE Show resolved Hide resolved

pombredanne changed the title ~~Update spdx license list to 3.20~~ Add new and improve existing licenses Mar 1, 2023

pombredanne requested changes Mar 1, 2023

View reviewed changes

Bump SPDX license list version to 3.20

fb7b406

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

AyanSinhaMahapatra requested a review from pombredanne March 1, 2023 15:01

pombredanne approved these changes Mar 1, 2023

View reviewed changes

AyanSinhaMahapatra merged commit 22109c4 into develop Mar 7, 2023

AyanSinhaMahapatra deleted the update-spdx-license-list-to-3.20 branch April 3, 2023 10:08

Uh oh!

Add new and improve existing licenses #3271

Add new and improve existing licenses #3271

Uh oh!

Conversation

AyanSinhaMahapatra commented Feb 22, 2023 • edited by pombredanne Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Tasks

AyanSinhaMahapatra left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pombredanne left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pombredanne left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pombredanne left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

pombredanne commented Mar 1, 2023

pombredanne left a comment

Choose a reason for hiding this comment

AyanSinhaMahapatra commented Mar 1, 2023

pombredanne left a comment

Choose a reason for hiding this comment

AyanSinhaMahapatra commented Mar 7, 2023

Labels

2 participants

AyanSinhaMahapatra commented Feb 22, 2023 •

edited by pombredanne

Loading

AyanSinhaMahapatra left a comment •

edited

Loading