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

[issue-181] add files at document-level #288

Merged
merged 8 commits into from
Nov 22, 2022

Conversation

meretp
Copy link
Collaborator

@meretp meretp commented Nov 15, 2022

This PR is still in progress but attempts to fix #181.

also fixes #297

Signed-off-by: Meret Behrens meret.behrens@tngtech.com

@meretp meretp force-pushed the issue_181_unpackaged_files branch 3 times, most recently from 595f2ef to c38fea8 Compare November 16, 2022 16:32
@meretp meretp changed the title WIP: [issue-181] add files at document-level [issue-181] add files at document-level Nov 16, 2022
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.

Thanks for the big contribution! I left a bunch of suggestions, but it looks very good overall

spdx/document.py Outdated Show resolved Hide resolved
spdx/parsers/jsonyamlxml.py Outdated Show resolved Hide resolved
spdx/parsers/jsonyamlxml.py Show resolved Hide resolved
spdx/parsers/jsonyamlxml.py Outdated Show resolved Hide resolved
spdx/parsers/jsonyamlxml.py Outdated Show resolved Hide resolved
tests/utils_test.py Outdated Show resolved Hide resolved
tests/test_rdf_parser.py Show resolved Hide resolved
tests/test_jsonyamlxml_writer.py Outdated Show resolved Hide resolved
tests/test_jsonyamlxml_writer.py Outdated Show resolved Hide resolved
tests/test_document.py Outdated Show resolved Hide resolved
@meretp meretp force-pushed the issue_181_unpackaged_files branch 2 times, most recently from 0f4d147 to f002bd3 Compare November 22, 2022 09:19
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 found a few more things, but I think we are pretty close now!

spdx/document.py Outdated Show resolved Hide resolved
spdx/writers/jsonyamlxml.py Outdated Show resolved Hide resolved
spdx/writers/jsonyamlxml.py Show resolved Hide resolved
spdx/writers/jsonyamlxml.py Show resolved Hide resolved
tests/test_document.py Outdated Show resolved Hide resolved
spdx/writers/tagvalue.py Outdated Show resolved Hide resolved
spdx/writers/tagvalue.py Outdated Show resolved Hide resolved
spdx/writers/tagvalue.py Outdated Show resolved Hide resolved
spdx/writers/tagvalue.py Outdated Show resolved Hide resolved
spdx/writers/tagvalue.py Outdated Show resolved Hide resolved
nicoweidner
nicoweidner previously approved these changes Nov 22, 2022
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.

Only some nits left, thanks for addressing everything!

tests/test_jsonyamlxml_writer.py Outdated Show resolved Hide resolved
tests/test_document.py Outdated Show resolved Hide resolved
leads to failing test concerning rdf-files

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
…iter/parser

leads to failing tests for rdf and tv files
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp meretp merged commit 7b3ac06 into spdx:main Nov 22, 2022
@meretp meretp deleted the issue_181_unpackaged_files branch November 22, 2022 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants