Add license dump option #3100
Merged
Add license dump option #3100
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Signed-off-by: Thomas Druez <tdruez@nexb.com>
Signed-off-by: Thomas Druez <tdruez@nexb.com>
Signed-off-by: Thomas Druez <tdruez@nexb.com>
Signed-off-by: Thomas Druez <tdruez@nexb.com>
Signed-off-by: Thomas Druez <tdruez@nexb.com>
Signed-off-by: Thomas Druez <tdruez@nexb.com>
Signed-off-by: Thomas Druez <tdruez@nexb.com>
* Expose spdx_license_key, other_spdx_license_keys, and is_exception Signed-off-by: Jono Yang <jyang@nexb.com>
Expose SPDX license info in index.json #7
Signed-off-by: tdruez <tdruez@nexb.com>
Signed-off-by: tdruez <tdruez@nexb.com>
Signed-off-by: tdruez <tdruez@nexb.com>
Signed-off-by: Jono Yang <jyang@nexb.com>
Expose is_deprecated in index.json
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
This commit ends the process of merging .RULE and .yml files into a single .RULE file which has YAML frontmatter storing the rule metadata present in the .yml file previously. This renaming and merging has been done to preserve line-history for both the files. Reference: #3049 Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
* Import and use functions/classes from frontmatter * Copy and modify class to use saneyaml * Copy and modify load/parse functions * Add .ABOUT and LICENSE files. Signed-off-by: AyanSinhaMahapatra <ayansmahapatra@gmail.com>
Reference: aboutcode-org/scancode-licensedb#25 Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
2 tasks
AyanSinhaMahapatra force-pushed the add-license-dump-option branch from 719fabb to 84f8a01 Compare Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
AyanSinhaMahapatra force-pushed the add-license-dump-option branch from 84f8a01 to a7cc2d5 Compare Regen test expectations for this and also fix another test. Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
AyanSinhaMahapatra force-pushed the add-license-dump-option branch from 6843a32 to 8a8fba0 Compare 
pombredanne approved these changes Oct 28, 2022
There was a problem hiding this comment.
LGTM... Please do one last check wrt. spaces:
from licensedcode.models import * gpl=db["gpl-2.0"] bottom = gpl.text.strip("\n") + "\n" top = saneyaml.dump(gpl.to_dict()) fm=f"---\n{top}\n---\n{bottom}"IMHO redumping all licenses as frontmatter this way should be to help that we are not damaging space-based formatting. In particualr watch out for the GPL -2.0.
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
AyanSinhaMahapatra force-pushed the add-license-dump-option branch 2 times, most recently from 8b1d58e to 093b8b4 Compare Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
AyanSinhaMahapatra force-pushed the add-license-dump-option branch from 093b8b4 to bc6d6a5 Compare Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
| @pombredanne post your approval I've pushed the following changes:
Should I go ahead and merge? |
| Some scripts need update but I opened an issue: #3138 to track that separately to not block this anymore. |
7 tasks
| Note that the command line option was later renamed from |
sschuberth added a commit to oss-review-toolkit/ort that referenced this pull request Nov 16, 2023
ScanCode 32.0.0 started to prepend its `*.LICENSE` files with YAML-encoded metadata, see [1]. This is a hot fix to remove this header, if present, from the license files. A better solution will be implemented later as part of a larger refactoring of license providers. Different ScanCode versions also differ in whether license files come with a final newline or not. Align on not having a final newline to make tests pass either way. [1]: aboutcode-org/scancode-toolkit#3100 Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
sschuberth added a commit to oss-review-toolkit/ort that referenced this pull request Nov 16, 2023
ScanCode 32.0.0 started to prepend its `*.LICENSE` files with YAML-encoded metadata, see [1]. This is a hot fix to remove this header, if present, from the license files. A better solution will be implemented later as part of a larger refactoring of license providers. Different ScanCode versions also differ in whether license files come with a final newline or not. Align on not having a final newline to make tests pass either way. [1]: aboutcode-org/scancode-toolkit#3100 Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
sschuberth added a commit to oss-review-toolkit/ort that referenced this pull request Nov 17, 2023
ScanCode 32.0.0 started to prepend its `*.LICENSE` files with YAML-encoded metadata, see [1]. This is a hot fix to remove this header, if present, from the license files. A better solution will be implemented later as part of a larger refactoring of license providers. Different ScanCode versions also differ in whether license files come with a final newline or not. Align on not having a final newline to make tests pass either way. [1]: aboutcode-org/scancode-toolkit#3100 Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
sschuberth added a commit to oss-review-toolkit/ort that referenced this pull request Nov 17, 2023
ScanCode 32.0.0 started to prepend its `*.LICENSE` files with YAML-encoded metadata, see [1]. This is a hot fix to remove this header, if present, from the license files. A better solution will be implemented later as part of a larger refactoring of license providers. Different ScanCode versions also differ in whether license files come with a final newline or not. Align on not having a final newline to make tests pass either way. [1]: aboutcode-org/scancode-toolkit#3100 Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
--get-license-datato:This is reusing code originally located at:
https://github.com/nexB/scancode-licensedb
Reference: #2738
Reference: #3049
This also contains PR: #3063 btw.
Tasks
Run tests locally to check for errors.