Assorted bug fixes #270
Merged
Assorted bug fixes #270
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
DimarrWS
approved these changes
Nov 9, 2022
DimarrWS
approved these changes
Nov 9, 2022
DimarrWS
previously approved these changes
Nov 9, 2022
Closed
nicoweidner
reviewed
Nov 9, 2022
spdx/relationship.py
Outdated
Comment on lines
17
to
18
| # Implement the auto feature that becomes available in 3.6 | ||
| autoinc = 0 |
There was a problem hiding this comment.
This looks like it's redundant now?
spdx/writers/rdf.py
Outdated
| @@ -536,15 +537,30 @@ class RelationshipInfoWriter(BaseWriter): | |||
| def __init__(self, document, out): | |||
| super(RelationshipInfoWriter, self).__init__(document, out) | |||
|
|
|||
| def create_relationship_node(self, relationship): | |||
| def create_relationshiptype(self, relationshiptype: str) -> str: | |||
There was a problem hiding this comment.
Should be relationship_type. Can you rename the properties on the Relationship class? Applies to spdxelementid and relatedspdxelement as well
There was a problem hiding this comment.
Also:
- the method name doesn't match what the method does anymore. Something like
transform_relationship_type_to_rdf_modelmaybe? (but maybe you have a less clunky idea) - The logic looks a bit cryptic now. Maybe you can include an example in the docstring?
- This is a conversion from upper snake case (hope that term exists...) to camel case, right? If so, we could mention that
spdx/writers/rdf.py
Outdated
| type_triple = (relationship_node, RDF.type, self.spdx_namespace.Relationship) | ||
| self.graph.add(type_triple) | ||
|
|
||
| relationship_type_node = Literal(relationship.relationshiptype) | ||
| relationship_spdx_element = Literal(relationship.spdxelementid) |
There was a problem hiding this comment.
relationship_spdx_element_id
spdx/writers/rdf.py
Outdated
| ) | ||
| ) | ||
| relationship_type = self.create_relationshiptype(relationship.relationshiptype) | ||
| relationship_type_node = self.spdx_namespace["relationshipType_" + relationship_type] |
There was a problem hiding this comment.
If the method currently named create_relationshiptype retains the purpose of "converting to rdf-compatible style", I would include adding the relationshipType_ prefix in that method.
nicoweidner
previously approved these changes
Nov 9, 2022
This code is based on commits of the WhiteSource PS Team, esp. the authors: tamari-oz, NatalyaDalid, rammatzkvosky and DimarrWS. Thank you for your contribution! Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
This code is based on commits of the WhiteSource PS Team, esp. the authors: tamari-oz, NatalyaDalid, rammatzkvosky and DimarrWS. Thank you for your contribution! Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
This code is based on commits of the WhiteSource PS Team, esp. the authors: tamari-oz, NatalyaDalid, rammatzkvosky and DimarrWS. Thank you for your contribution! Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
This code is based on commits of the WhiteSource PS Team, esp. the authors: tamari-oz, NatalyaDalid, rammatzkvosky and DimarrWS. Thank you for your contribution! Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
This code is based on commits of the WhiteSource PS Team, esp. the authors: tamari-oz, NatalyaDalid, rammatzkvosky and DimarrWS. Thank you for your contribution! Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
meretp
force-pushed
the
assorted_bug_fixes
branch
from
d385001
to
7522e19
Compare
nicoweidner
approved these changes
Nov 9, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Taken over from #263 resp. #207 because signoffs were missing.
This code is based on commits of the WhiteSource PS Team, esp. the authors: @tamari-oz, @NatalyaDalid, @rammatzkvosky and @DimarrWS. Thank you for your contribution!