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

fix(spdx-utils): Support dashed reference category names #9157

Merged
merged 1 commit into from
Sep 17, 2024

Conversation

sschuberth
Copy link
Member

This revives the change from 1 for compatibility when reading SPDX files.

@sschuberth sschuberth requested a review from a team as a code owner September 17, 2024 07:58
oheger-bosch
oheger-bosch previously approved these changes Sep 17, 2024
import org.ossreviewtoolkit.utils.spdx.SpdxModelMapper

class SpdxExternalReferenceTest : WordSpec({
"Serializing a categories" should {
Copy link
Member

Choose a reason for hiding this comment

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

Nit: "Serializing categories" or "Serializing a category". Same for deserializing below.

Copy link

codecov bot commented Sep 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.08%. Comparing base (9f7b625) to head (4d6e07c).
Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #9157   +/-   ##
=========================================
  Coverage     67.08%   67.08%           
  Complexity     1188     1188           
=========================================
  Files           240      240           
  Lines          7901     7901           
  Branches        915      915           
=========================================
  Hits           5300     5300           
  Misses         2232     2232           
  Partials        369      369           
Flag Coverage Δ
funTest-non-docker 34.49% <ø> (ø)
test 36.60% <100.00%> (ø)

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.

oheger-bosch
oheger-bosch previously approved these changes Sep 17, 2024
@sschuberth
Copy link
Member Author

sschuberth commented Sep 17, 2024

Sorry @oheger-bosch, I had to fix this up yet again to not require changes in ORT's test assets and run into the same discussion about backward compatibility as for #7839.

This is a follow-up to the unmerged changes from [1] to support reading
dashed reference category names while still writing underscored names for
backward compatibility with ORT's code base.

[1]: https://github.com/oss-review-toolkit/ort/pull/7839/files#diff-d290822c4f4714ad4b5d29e52d75edfa3c70e3e80e258d69adf0f6a82d8ae9a4

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
@sschuberth
Copy link
Member Author

Merging despite the unrelated Python test failures.

@sschuberth sschuberth merged commit 508dbfc into main Sep 17, 2024
21 of 22 checks passed
@sschuberth sschuberth deleted the spdx-2.2.0-vs-2.2.2 branch September 17, 2024 17:21
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