Skip to content

fix: ComparablePackageURL includes name #1022

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

Open
arpitjain099 wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −1
Open

fix: ComparablePackageURL includes name #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions cyclonedx/_internal/compare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def __new__(cls, p: 'PackageURL') -> 'ComparablePackageURL':
return super().__new__(cls, (
p.type,
p.namespace,
p.name,
p.version,
ComparableDict(p.qualifiers) if isinstance(p.qualifiers, dict) else p.qualifiers,
p.subpath
Expand Down
21 changes: 20 additions & 1 deletion tests/test_model.py
View file
Open in desktop

@jkowalleck jkowalleck Jul 31, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

please move your newly added tests to an own test file tests/test_internal/test_compare.py

Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@

from ddt import ddt, named_data

from cyclonedx._internal.compare import ComparableTuple
from packageurl import PackageURL

from cyclonedx._internal.compare import ComparablePackageURL, ComparableTuple
from cyclonedx.exception.model import InvalidLocaleTypeException, InvalidUriException, UnknownHashTypeException
from cyclonedx.model import (
Copyright,
Expand Down Expand Up @@ -70,6 +72,23 @@ def test_sort(self) -> None:
self.assertListEqual(sorted_enums, expected_enums)


class TestComparablePackageURL(TestCase):

def test_differs_by_name(self) -> None:
# name was missing from the comparison tuple, so two purls that differ
# only by name compared equal
purl1 = ComparablePackageURL(PackageURL(type='pypi', name='foo', version='1.0.0'))
purl2 = ComparablePackageURL(PackageURL(type='pypi', name='bar', version='1.0.0'))
self.assertNotEqual(purl1, purl2)
self.assertGreater(purl1, purl2)
self.assertLess(purl2, purl1)

def test_equal_same_purl(self) -> None:
purl1 = ComparablePackageURL(PackageURL(type='pypi', name='foo', version='1.0.0'))
purl2 = ComparablePackageURL(PackageURL(type='pypi', name='foo', version='1.0.0'))
self.assertEqual(purl1, purl2)


class TestComparableTuple(TestCase):

def test_equal_self(self) -> None:
Expand Down