Skip to content

Commit aa5b936

Browse files
authored
chore(deps): update poetry and other dependency versions (#369)
* update packageurl type hints Signed-off-by: gruebel <[email protected]> * lower bound packageurl-python dependency Signed-off-by: gruebel <[email protected]> * update deps.lowest.r Signed-off-by: gruebel <[email protected]> --------- Signed-off-by: gruebel <[email protected]>
1 parent 2371a1b commit aa5b936

File tree

8 files changed

+75
-86
lines changed

8 files changed

+75
-86
lines changed

cyclonedx/model/bom.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
from .vulnerability import Vulnerability
5353

5454
if TYPE_CHECKING:
55-
from packageurl import PackageURL # type:ignore[import]
55+
from packageurl import PackageURL
5656

5757

5858
@serializable.serializable_class

cyclonedx/model/component.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
# See https://github.com/package-url/packageurl-python/issues/65
2727
import serializable
28-
from packageurl import PackageURL # type: ignore
28+
from packageurl import PackageURL
2929
from sortedcontainers import SortedSet
3030

3131
from ..exception.model import NoPropertiesProvidedException

cyclonedx/serialization/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from uuid import UUID
2222

2323
# See https://github.com/package-url/packageurl-python/issues/65
24-
from packageurl import PackageURL # type: ignore
24+
from packageurl import PackageURL
2525
from serializable.helpers import BaseHelper
2626

2727
from ..model.bom_ref import BomRef
@@ -71,7 +71,7 @@ def serialize(cls, o: object) -> str:
7171
raise ValueError(f'Attempt to serialize a non-UUID: {o.__class__}')
7272

7373
@classmethod
74-
def deserialize(cls, o: object) -> PackageURL:
74+
def deserialize(cls, o: object) -> UUID:
7575
try:
7676
return UUID(str(o))
7777
except ValueError:

deps.lowest.r

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# exactly pinned dependencies to the lowest version regardless of python_version
22
# see pyptoject file for ranges
33

4-
packageurl-python == 0.9.0
4+
packageurl-python == 0.11.1
55
py-serializable == 0.11.1
66
importlib-metadata == 3.4.0 # ; python_version < '3.8'
77

poetry.lock

Lines changed: 67 additions & 78 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ keywords = [
4848
# ATTENTION: keep `deps.lowest.r` file in sync
4949
python = "^3.7"
5050
importlib-metadata = { version = "^3.4.0", python = "<3.8" }
51-
packageurl-python = ">= 0.9"
51+
packageurl-python = ">= 0.11"
5252
py-serializable = "^0.11.1"
5353
sortedcontainers = "^2.4.0"
5454

tests/data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from uuid import UUID
2525

2626
# See https://github.com/package-url/packageurl-python/issues/65
27-
from packageurl import PackageURL # type: ignore
27+
from packageurl import PackageURL
2828

2929
from cyclonedx.model import (
3030
AttachedText,

tests/test_component.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from unittest import TestCase
2222

2323
# See https://github.com/package-url/packageurl-python/issues/65
24-
from packageurl import PackageURL # type: ignore
24+
from packageurl import PackageURL
2525

2626
from cyclonedx.model import sha1sum
2727
from cyclonedx.model.component import Component

0 commit comments

Comments
 (0)