Skip to content

fix: include all fields of Component in __lt__ function for #586 #587

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

Merged
madpah merged 2 commits into from
Apr 22, 2024
Merged

fix: include all fields of Component in __lt__ function for #586 #587

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17ffc81
fix: include all fields of `Component` in `__lt__` function for #586
madpah Apr 12, 2024
8722458
Merge branch 'main' into fix/component-ordering
madpah Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions cyclonedx/model/component.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,9 +1699,19 @@ def __eq__(self, other: object) -> bool:
def __lt__(self, other: Any) -> bool:
if isinstance(other, Component):
return _ComparableTuple((
self.type, self.group, self.name, self.version
self.type, self.mime_type, self.supplier, self.author, self.publisher, self.group, self.name,
self.version, self.description, self.scope, _ComparableTuple(self.hashes),
_ComparableTuple(self.licenses), self.copyright, self.cpe, self.purl, self.swid, self.pedigree,
_ComparableTuple(self.external_references), _ComparableTuple(self.properties),
_ComparableTuple(self.components), self.evidence, self.release_notes, self.modified,
_ComparableTuple(self.authors), _ComparableTuple(self.omnibor_ids),
)) < _ComparableTuple((
other.type, other.group, other.name, other.version
other.type, other.mime_type, other.supplier, other.author, other.publisher, other.group, other.name,
other.version, other.description, other.scope, _ComparableTuple(other.hashes),
_ComparableTuple(other.licenses), other.copyright, other.cpe, other.purl, other.swid, other.pedigree,
_ComparableTuple(other.external_references), _ComparableTuple(other.properties),
_ComparableTuple(other.components), other.evidence, other.release_notes, other.modified,
_ComparableTuple(other.authors), _ComparableTuple(other.omnibor_ids),
))
return NotImplemented

Expand Down