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

[issue-407] add rdf writer #448

Merged
merged 51 commits into from
Feb 1, 2023
Merged

[issue-407] add rdf writer #448

merged 51 commits into from
Feb 1, 2023

Conversation

meretp
Copy link
Collaborator

@meretp meretp commented Jan 26, 2023 •
edited
Loading

This PR solves a subtask of #407 by adding a RDF writer to the refactored branch. As a start the used package rdflib is declared as an optional dependency, but it is still open to handle this properly in the implementation. This leads to the failing pipeline.

@meretp meretp force-pushed the issue-407-add-rdf-writer branch 4 times, most recently from cd0d4bc to 00260cf Compare January 30, 2023 14:28
@meretp
Copy link
Collaborator Author

meretp commented Jan 31, 2023

fixes #455

armintaenzertng
armintaenzertng requested changes Jan 31, 2023
View reviewed changes
Copy link
Collaborator

@armintaenzertng armintaenzertng 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 taking the effort to gain in-depth understanding of rdf! :)
I have a few comments, mostly regarding namings or code structure.

src/spdx/writer/rdf/checksum_writer.py Outdated Show resolved Hide resolved
src/spdx/writer/rdf/writer_utils.py Outdated Show resolved Hide resolved
src/spdx/writer/rdf/writer_utils.py Outdated Show resolved Hide resolved
src/spdx/writer/rdf/writer_utils.py Outdated Show resolved Hide resolved
pyproject.toml Outdated Show resolved Hide resolved
tests/spdx/writer/rdf/test_package_writer.py Outdated Show resolved Hide resolved
tests/spdx/writer/rdf/test_rdf_writer.py Show resolved Hide resolved
tests/spdx/writer/rdf/test_snippet_writer.py Outdated Show resolved Hide resolved
tests/spdx/writer/rdf/test_extracted_licensing_info_writer.py Outdated Show resolved Hide resolved
src/spdx/writer/rdf/writer_utils.py Show resolved Hide resolved
armintaenzertng
armintaenzertng reviewed Feb 1, 2023
View reviewed changes
Copy link
Collaborator

@armintaenzertng armintaenzertng left a comment

Choose a reason for hiding this comment

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

Just a few more remarks :)

src/spdx/writer/rdf/writer_utils.py Outdated Show resolved Hide resolved
tests/spdx/writer/rdf/test_license_expression_writer.py Outdated Show resolved Hide resolved
tests/spdx/writer/rdf/test_snippet_writer.py Outdated Show resolved Hide resolved
tests/spdx/writer/rdf/test_license_expression_writer.py Outdated Show resolved Hide resolved
tests/spdx/writer/rdf/test_annotation_writer.py Outdated Show resolved Hide resolved
armintaenzertng
armintaenzertng reviewed Feb 1, 2023
View reviewed changes
src/spdx/writer/rdf/writer_utils.py Outdated
graph.add((parent, predicate, Literal(str(element))))
return
graph.add((parent, predicate, Literal(str(value))))
return
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is unnecessary at the end of a method

armintaenzertng
armintaenzertng approved these changes Feb 1, 2023
View reviewed changes
Copy link
Collaborator

@armintaenzertng armintaenzertng left a comment

Choose a reason for hiding this comment

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

Looks good to me now, thanks :)

meretp added 20 commits February 1, 2023 09:31
@meretp
delete unused dependencies und update README.md
94a1050 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add writer for rdf, start with simple graph
febe022 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add writer for creation information
68e1805 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add writer for annotations
6b0129a 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] connect annotation with spdx element that is annotated
794c056 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add annotation_type as resource not Literal
9b53dcd 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add relationship writer
1d63be9 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add relationship writer to document writer
9a3f0de 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add checksum writer
7aa5c7d 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add file writer
9df6d6b 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] fix annotation test
9f07f66 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] also use add_value_if_exists in creation information
dd92310 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] turn spdx_namespace into a variable
b61750b 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407, refactor] rename function
f93f660 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add helper functions to handle SpdxNoAssertion and SpdxNone
d03bdf9 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add package writer
d2534c7 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] use helper method to transform enum names correctly
bf70966 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add transformation from ChecksumAlgorithm to rdf string
679471a 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add snippet writer
453b135 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add extracted licensing info writer
51ee09b 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
meretp added 8 commits February 1, 2023 09:31
@meretp
[issue-407] fix pipeline
af1e3a0 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] fix writing of data license
4a96c92 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] fix tests after rebase
8f6b243 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add license expression writer
cb56a58 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] delete unused imports
70457f9 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] refactor
33ea172 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] delete debug output from development
c676827 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407, review] make global constants uppercase
8e4113e 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp meretp force-pushed the issue-407-add-rdf-writer branch from a5c5857 to c0cd630 Compare February 1, 2023 09:29
meretp added 14 commits February 1, 2023 10:33
@meretp
[issue-407, review] reformat and use positive logic
7c7c05a 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407, review] also test line_range and set datatype for offset …
bfb8ee6 
…and lineNumber to integer

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407, review] include all parameters in test
65b20d9 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407, review] rename parameter for clarification
34dfe29 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407, review] add tests for helper function and add error handling
5ac24af 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407, review] rename
64caf43 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407, review] refactor: change order of arguments and rename so…
975e115 
…me of them

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407, review] make comment in pyproject.toml more comprehensible
d86e712 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407, review] rename methods
3e21033 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407, review] use fixture values in assert statements
506fafd 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407, refactor] introduce module "rdfschema" to use common spdx…
bde80ff 
… namespaces in rdf writer and parser

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407] add license and reference namespace
22ee52f 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407, review] inline triple
9d88414 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp
[issue-407, review] precise tests by using RDF.type as predicate and …
3eaf91c 
…not only None as a wildcard

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp meretp force-pushed the issue-407-add-rdf-writer branch from c0cd630 to 3eaf91c Compare February 1, 2023 09:33
@meretp meretp merged commit e25467f into spdx:refactor-python-tools Feb 1, 2023
@meretp meretp deleted the issue-407-add-rdf-writer branch February 1, 2023 09:42
@meretp meretp mentioned this pull request Feb 1, 2023
Closed
This was referenced Feb 9, 2023
Merged
Merged
@meretp meretp mentioned this pull request Feb 22, 2023
Closed
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@armintaenzertng armintaenzertng armintaenzertng 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.
2 participants
@meretp @armintaenzertng