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

Add new and improve existing licenses #3271

Merged
merged 12 commits into from
Mar 7, 2023
Merged

Add new and improve existing licenses #3271

merged 12 commits into from
Mar 7, 2023

Conversation

AyanSinhaMahapatra
Copy link
Member

@AyanSinhaMahapatra AyanSinhaMahapatra commented Feb 22, 2023 •
edited by pombredanne
Loading

This PR:

Fixes #3263
Fixes #3257

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 📁

@AyanSinhaMahapatra
Fix license list version value in spdx tv output #3257
c2269f3 
Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
@AyanSinhaMahapatra
Restore old spdx license keys with scancode licenseref
e33bff1 
Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
@AyanSinhaMahapatra
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 <[email protected]>
@AyanSinhaMahapatra
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 <[email protected]>
@AyanSinhaMahapatra
Add updates in license rules from SPDX license list #3263
e1f821c 
Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
@AyanSinhaMahapatra
Format LICENSE files correctly
e11af29 
Update license files with correct order of attributes.

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
@AyanSinhaMahapatra
Add license data updates
c6dfc2c 
Add license data updates from @DennisClark

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
@AyanSinhaMahapatra AyanSinhaMahapatra mentioned this pull request Feb 22, 2023
Closed
@AyanSinhaMahapatra
Add new licenses
7115096 
Add new licenses from @DennisClark

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
@AyanSinhaMahapatra AyanSinhaMahapatra force-pushed the update-spdx-license-list-to-3.20 branch from 0a4fbe6 to 7115096 Compare February 22, 2023 23:14
@AyanSinhaMahapatra
Fix invalid license key
d2f343c 
Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
@AyanSinhaMahapatra AyanSinhaMahapatra force-pushed the update-spdx-license-list-to-3.20 branch from 4e5f898 to 040e548 Compare February 23, 2023 10:43
AyanSinhaMahapatra
AyanSinhaMahapatra commented Feb 23, 2023
View reviewed changes
Copy link
Member Author

@AyanSinhaMahapatra AyanSinhaMahapatra left a comment •
edited
Loading

Choose a reason for hiding this comment

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

@DennisClark see comments for doubts that I had.

src/licensedcode/data/licenses/adacore-doc.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/iec-code-components-eula.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/jpl-image.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/ucar.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/hpnd-export-us.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/cfitsio.LICENSE Show resolved Hide resolved
@AyanSinhaMahapatra AyanSinhaMahapatra force-pushed the update-spdx-license-list-to-3.20 branch from 040e548 to 5095c44 Compare February 24, 2023 09:13
@AyanSinhaMahapatra AyanSinhaMahapatra force-pushed the update-spdx-license-list-to-3.20 branch from 5095c44 to 032550e Compare February 24, 2023 09:16
pombredanne
pombredanne requested changes Feb 24, 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 is a first pass of review!

src/licensedcode/data/licenses/cfitsio.LICENSE Outdated Show resolved Hide resolved
src/licensedcode/data/licenses/cfitsio.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/clips.LICENSE Outdated Show resolved Hide resolved
src/licensedcode/data/licenses/cooperative-non-violent-6.0.LICENSE Outdated Show resolved Hide resolved
src/licensedcode/data/licenses/cornell-lossless-jpeg.LICENSE Outdated Show resolved Hide resolved
src/licensedcode/data/licenses/inria-linking-exception.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/jpl-image.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/kazlib.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/jpl-image.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/loop.LICENSE Show resolved Hide resolved
pombredanne
pombredanne requested changes Feb 24, 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.

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 Outdated Show resolved Hide resolved
src/licensedcode/data/licenses/offis.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/qpl-1.0-inria-2004.LICENSE Show resolved Hide resolved
src/licensedcode/data/licenses/swi-exception.LICENSE Outdated Show resolved Hide resolved
src/licensedcode/data/licenses/ucar.LICENSE Show resolved Hide resolved
src/licensedcode/data/rules/sunpro_2.RULE Show resolved Hide resolved
src/licensedcode/data/licenses/brian-gladman-3-clause.LICENSE Outdated Show resolved Hide resolved
src/licensedcode/data/rules/x11-bitstream_5.RULE Outdated Show resolved Hide resolved
tests/licensedcode/data/datadriven/external/fossology-tests/Dual-license/aes.h.yml Outdated Show resolved Hide resolved
...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 Outdated Show resolved Hide resolved
@AyanSinhaMahapatra AyanSinhaMahapatra modified the milestones: v32.0, v32.1 Feb 27, 2023
@AyanSinhaMahapatra AyanSinhaMahapatra force-pushed the update-spdx-license-list-to-3.20 branch from 2cfd879 to f2167ee Compare February 28, 2023 14:51
@AyanSinhaMahapatra
Add feedback on license additions
697d2a2 
- Add updates based on feedback from @pombredanne and @DennisClark

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
@AyanSinhaMahapatra AyanSinhaMahapatra force-pushed the update-spdx-license-list-to-3.20 branch from f2167ee to 697d2a2 Compare March 1, 2023 13:28
pombredanne
pombredanne approved these changes Mar 1, 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! LGTM! there are two minor nits that you are free to ignore!

src/formattedcode/output_spdx.py Outdated Show resolved Hide resolved
src/licensedcode/data/licenses/acm-sla.LICENSE Show resolved Hide resolved
@pombredanne pombredanne changed the title Update spdx license list to 3.20 Add new and improve existing licenses Mar 1, 2023
@pombredanne
Copy link
Member

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

pombredanne
pombredanne requested changes Mar 1, 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.

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

@AyanSinhaMahapatra
Bump SPDX license list version to 3.20
fb7b406 
Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
@AyanSinhaMahapatra
Copy link
Member Author

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

pombredanne
pombredanne approved these changes Mar 1, 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!

@AyanSinhaMahapatra
Copy link
Member Author

All green and resolved, merging this!

@AyanSinhaMahapatra AyanSinhaMahapatra merged commit 22109c4 into develop Mar 7, 2023
@AyanSinhaMahapatra AyanSinhaMahapatra deleted the update-spdx-license-list-to-3.20 branch April 3, 2023 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pombredanne pombredanne pombredanne approved these changes

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

Successfully merging this pull request may close these issues.

Update SPDX license list to 3.20 LicenseListVersion: 3.6
2 participants
@AyanSinhaMahapatra @pombredanne