Skip to content

Commit 26c4d62

Browse files
authored
Merge pull request #176 from sw360/cyclonedx-1.7
feat(pyproject): update to cyclonedx-python-lib 11.6
2 parents 80381fd + 1b04a0b commit 26c4d62

File tree

5 files changed

+26
-25
lines changed

5 files changed

+26
-25
lines changed

capycli/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def emit(self, record: logging.LogRecord) -> None:
123123
else:
124124
# info, debug, all other
125125
# suppress all cyclonedx serialize log output
126-
if record.name == "serializable":
126+
if (record.name == "serializable") or record.name == "py_serializable":
127127
return
128128
print(msg)
129129
except Exception:

capycli/bom/show_bom.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import sys
1515
from typing import Any
1616

17-
from cyclonedx.factory.license import DisjunctiveLicense, LicenseExpression # type: ignore
17+
from cyclonedx.model.license import DisjunctiveLicense, LicenseExpression
1818
from cyclonedx.model import XsUri
1919
from cyclonedx.model.bom import Bom
2020
from cyclonedx.model.component import Component

poetry.lock

Lines changed: 22 additions & 21 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
@@ -36,7 +36,7 @@ dependencies = [
3636
"wheel (>=0.38.4,<0.39.0)",
3737
"cli-support (==2.0.1)",
3838
"chardet (==5.2.0)",
39-
"cyclonedx-python-lib (>=8.0.0,<9.0.0)",
39+
"cyclonedx-python-lib (>=11.4.0,<12.0.0)",
4040
"dateparser (>=1.1.8,<2.0.0)",
4141
"urllib3 (>=2.5.0,<3.0.0)",
4242
"importlib-resources (>=5.12.0,<6.0.0)",

tests/test_sbom_licenses.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# -------------------------------------------------------------------------------
88

99
import pytest
10-
from cyclonedx.factory.license import LicenseExpression # type: ignore
10+
from cyclonedx.model.license import LicenseExpression
1111
from cyclonedx.model import XsUri
1212
from cyclonedx.model.bom import Bom
1313
from cyclonedx.model.component import Component

0 commit comments

Comments
 (0)