Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion capycli/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def emit(self, record: logging.LogRecord) -> None:
else:
# info, debug, all other
# suppress all cyclonedx serialize log output
if record.name == "serializable":
if (record.name == "serializable") or record.name == "py_serializable":
return
print(msg)
except Exception:
Expand Down
2 changes: 1 addition & 1 deletion capycli/bom/show_bom.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import sys
from typing import Any

from cyclonedx.factory.license import DisjunctiveLicense, LicenseExpression # type: ignore
from cyclonedx.model.license import DisjunctiveLicense, LicenseExpression
from cyclonedx.model import XsUri
from cyclonedx.model.bom import Bom
from cyclonedx.model.component import Component
Expand Down
43 changes: 22 additions & 21 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies = [
"wheel (>=0.38.4,<0.39.0)",
"cli-support (==2.0.1)",
"chardet (==5.2.0)",
"cyclonedx-python-lib (>=8.0.0,<9.0.0)",
"cyclonedx-python-lib (>=11.4.0,<12.0.0)",
"dateparser (>=1.1.8,<2.0.0)",
"urllib3 (>=2.5.0,<3.0.0)",
"importlib-resources (>=5.12.0,<6.0.0)",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_sbom_licenses.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# -------------------------------------------------------------------------------

import pytest
from cyclonedx.factory.license import LicenseExpression # type: ignore
from cyclonedx.model.license import LicenseExpression
from cyclonedx.model import XsUri
from cyclonedx.model.bom import Bom
from cyclonedx.model.component import Component
Expand Down