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 multiple checksums #311

Merged
merged 13 commits into from Nov 28, 2022
Merged

Add multiple checksums #311

merged 13 commits into from Nov 28, 2022

Conversation

meretp
Copy link
Collaborator

@meretp meretp commented Nov 24, 2022

Based on the contribution from @jotterson, thanks!

fixes #185

@meretp meretp force-pushed the add_multiple_checksums branch 2 times, most recently from 5c29442 to 6cfafe1 Compare November 24, 2022 12:14
@meretp meretp changed the title WIP: Add multiple checksums Add multiple checksums Nov 24, 2022
nicoweidner
nicoweidner requested changes Nov 25, 2022
View reviewed changes
Copy link
Collaborator

@nicoweidner nicoweidner left a comment

Choose a reason for hiding this comment

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

Quite a few comments 😅
For comments that would require larger changes, please decide for yourself whether it still makes sense to incorporate them, in view of the upcoming refactor. We can also discuss that in a meeting

spdx/checksum.py Outdated Show resolved Hide resolved
spdx/checksum.py Outdated Show resolved Hide resolved
spdx/checksum.py Outdated Show resolved Hide resolved
spdx/checksum.py Outdated Show resolved Hide resolved
spdx/cli_tools/parser.py Outdated Show resolved Hide resolved
tests/data/doc_parse/spdx-expected.json Outdated Show resolved Hide resolved
tests/data/doc_write/json-simple-plus.json Outdated Show resolved Hide resolved
tests/data/doc_write/json-simple.json Outdated Show resolved Hide resolved
tests/test_document.py Outdated Show resolved Hide resolved
tests/utils_test.py Outdated Show resolved Hide resolved
jotterson and others added 5 commits November 28, 2022 10:29
@jotterson @meretp
add support for multiple file checksums
a687220 
Signed-off-by: Jeffrey Otterson <otterson@yahoo.com>
@jotterson @meretp
allow multiple checksums for package, too.
32a5402 
Signed-off-by: Jeffrey Otterson <otterson@yahoo.com>
@meretp
[issue-185] fix failing tests
e179525 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-185] review fixes
f03ae97 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-185] add Enum for checksumAlgorithm
bdad9d4 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
nicoweidner
nicoweidner previously approved these changes Nov 28, 2022
View reviewed changes
Copy link
Collaborator

@nicoweidner nicoweidner left a comment

Choose a reason for hiding this comment

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

I noticed a few more small things, but looks very good now!

spdx/checksum.py Outdated Show resolved Hide resolved
spdx/checksum.py Outdated Show resolved Hide resolved
tests/test_checksum.py Outdated Show resolved Hide resolved
spdx/file.py Outdated Show resolved Hide resolved
spdx/package.py Outdated Show resolved Hide resolved
spdx/parsers/rdfbuilders.py Outdated Show resolved Hide resolved
spdx/parsers/rdfbuilders.py Outdated Show resolved Hide resolved
spdx/parsers/rdfbuilders.py Outdated Show resolved Hide resolved
spdx/parsers/tagvaluebuilders.py Outdated Show resolved Hide resolved
spdx/writers/tagvalue.py Outdated Show resolved Hide resolved
@meretp meretp force-pushed the add_multiple_checksums branch 2 times, most recently from a1ab8a9 to f830eba Compare November 28, 2022 12:53
nicoweidner
nicoweidner previously approved these changes Nov 28, 2022
View reviewed changes
spdx/checksum.py Outdated Show resolved Hide resolved
spdx/checksum.py Outdated Show resolved Hide resolved
spdx/package.py Outdated Show resolved Hide resolved
spdx/parsers/rdfbuilders.py Show resolved Hide resolved
nicoweidner
nicoweidner previously approved these changes Nov 28, 2022
View reviewed changes
@meretp
[issue-185] support multiple checksums for tv-files
9d05af8 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-185] refactor chk_sum to checksum
a068c8d 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-185] add mult. checksums support for jsonyamlxml
1b0f04e 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-185] review comments rdf
f99ac96 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-185] refactor checksums in package and file to dicts
b5f647c 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-185] delete duplicated checksum property
938cb10 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-185] use regex to match blake checksum algorithms in rdf files
9143c97 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-185] squash review commits
af36fb5 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp meretp merged commit 72780a4 into spdx:main Nov 28, 2022
@meretp meretp deleted the add_multiple_checksums branch November 28, 2022 15:39
@meretp meretp mentioned this pull request Nov 28, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nicoweidner nicoweidner nicoweidner approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Multiple checksums per entity allowed by spec, but not supported by FIle and Package classes
3 participants
@meretp @nicoweidner @jotterson