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.

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

Add support for ScanCode output format version 3 #7397

Merged
merged 3 commits into from
Sep 1, 2023
Merged

Conversation

sschuberth
Copy link
Member

Please have a look at the individual commit messages for the details.

@sschuberth sschuberth requested a review from a team as a code owner August 21, 2023 12:19
@codecov
Copy link

codecov bot commented Aug 21, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (c28158b) 60.93% compared to head (606bd5f) 60.93%.

❗ Current head 606bd5f differs from pull request most recent head 21b4266. Consider uploading reports for the commit 21b4266 to get more accurate results

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #7397   +/-   ##
=========================================
  Coverage     60.93%   60.93%           
  Complexity     1969     1969           
=========================================
  Files           338      338           
  Lines         16626    16626           
  Branches       2363     2363           
=========================================
  Hits          10131    10131           
  Misses         5517     5517           
  Partials        978      978           
Flag Coverage Δ
funTest-docker 69.33% <ø> (ø)
funTest-non-docker 29.48% <ø> (ø)
test 36.50% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sschuberth sschuberth marked this pull request as draft August 22, 2023 06:57
@sschuberth
Copy link
Member Author

sschuberth commented Aug 22, 2023

This is currently blocked by mockk/mockk#468.

Edit: @mnonnenmacher and myself discussed a work-around.

@sschuberth sschuberth mentioned this pull request Sep 1, 2023
@sschuberth sschuberth marked this pull request as ready for review September 1, 2023 13:46
Make the mapping code operate directly on strings to prepare for a
ScanCode data model refactoring.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
License reference information has been excluded by default from the
result [1]. As that information is required to map ScanCode license keys
to SPDX IDs [2], explicitly enable that option.

[1]: aboutcode-org/scancode-toolkit@84eda21
[2]: aboutcode-org/scancode-toolkit#3458

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
While in previous output formats the primary elements for license
entries were single license keys (which needed to be grouped to
expressions), starting with output format version 3 the primary license
entries are expressions.

Resolves #6617.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
@sschuberth sschuberth requested review from mnonnenmacher and a team September 1, 2023 15:04
@sschuberth sschuberth enabled auto-merge (rebase) September 1, 2023 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants