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

feat: change SPDX to the new internal opossum_model #200

Merged
merged 2 commits into from
Jan 28, 2025

Conversation

abraemer
Copy link
Contributor

@abraemer abraemer commented Jan 22, 2025

Summary of changes

  • minor changes to attribution_generation.py and helper_methods.py
  • convert_to_opossum.py now uses opossum_model.Resource which simplifies the logic
  • this caused some tests to change:
    • (minor) some tests require a conversion to opossum file format
    • resources_to_attribution used to have trailing "/" for folders which are no longer generated. This should have no impact on the validity of the .opossum file

Context and reason for change

Continuation of #190

Closes #197
tests follow separately (tracked by #205 )

@abraemer abraemer force-pushed the refactor-spdx-on-new-internal-model branch from 3b0e8f2 to 4f72940 Compare January 22, 2025 11:06
@abraemer abraemer force-pushed the refactor-consistent-model-pipeline branch from 54f5c61 to bd3735f Compare January 22, 2025 11:59
@abraemer abraemer force-pushed the refactor-spdx-on-new-internal-model branch from 4f72940 to 8aabac4 Compare January 22, 2025 11:59
@abraemer abraemer force-pushed the refactor-consistent-model-pipeline branch from bd3735f to 60f4f48 Compare January 23, 2025 06:37
Base automatically changed from refactor-consistent-model-pipeline to main January 23, 2025 15:15
@abraemer abraemer force-pushed the refactor-spdx-on-new-internal-model branch 2 times, most recently from bbe8684 to e0cdb6b Compare January 23, 2025 15:20
@abraemer abraemer marked this pull request as ready for review January 24, 2025 10:33
@abraemer abraemer requested a review from Hellgartner January 24, 2025 10:34
@Hellgartner Hellgartner self-assigned this Jan 27, 2025
src/opossum_lib/spdx/convert_to_opossum.py Show resolved Hide resolved
src/opossum_lib/spdx/convert_to_opossum.py Outdated Show resolved Hide resolved
src/opossum_lib/spdx/convert_to_opossum.py Show resolved Hide resolved
tests/data/expected_opossum.json Outdated Show resolved Hide resolved
* minor changes to attribution_generation.py and helper_methods.py
* convert_to_opossum.py now uses opossum_model.Resource which simplifies the logic
* this caused some tests to change:
 - (minor) some tests require a conversion to opossum file format
 - resources_to_attribution used to have trailing "/" for folders which are no longer
   generated. This should have no impact on the validity of the .opossum file
@abraemer abraemer force-pushed the refactor-spdx-on-new-internal-model branch from 9993b78 to 165d134 Compare January 28, 2025 08:45
@abraemer abraemer force-pushed the refactor-spdx-on-new-internal-model branch from 165d134 to cfe5a54 Compare January 28, 2025 08:46
@abraemer abraemer enabled auto-merge January 28, 2025 08:47
@Hellgartner Hellgartner self-requested a review January 28, 2025 08:48
@abraemer abraemer merged commit 7675ac7 into main Jan 28, 2025
10 checks passed
@abraemer abraemer deleted the refactor-spdx-on-new-internal-model branch January 28, 2025 08:49
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.

Apply new flow to SPDX
2 participants