From 97de8dc8feb363956f01e335308af25a4c0beae2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 01:18:02 +0000 Subject: [PATCH 1/3] chore: bump cyclonedx-python-lib from 8.3.0 to 8.4.0 Bumps [cyclonedx-python-lib](https://github.com/CycloneDX/cyclonedx-python-lib) from 8.3.0 to 8.4.0. - [Release notes](https://github.com/CycloneDX/cyclonedx-python-lib/releases) - [Changelog](https://github.com/CycloneDX/cyclonedx-python-lib/blob/main/CHANGELOG.md) - [Commits](https://github.com/CycloneDX/cyclonedx-python-lib/compare/v8.3.0...v8.4.0) --- updated-dependencies: - dependency-name: cyclonedx-python-lib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 01e08e5a..8acc6705 100644 --- a/poetry.lock +++ b/poetry.lock @@ -382,13 +382,13 @@ toml = ["tomli"] [[package]] name = "cyclonedx-python-lib" -version = "8.3.0" +version = "8.4.0" description = "Python library for CycloneDX" optional = false python-versions = "<4.0,>=3.8" files = [ - {file = "cyclonedx_python_lib-8.3.0-py3-none-any.whl", hash = "sha256:80519d8de7f7d18287495d34c48a79c7bd9dcea5bbb57e929d9fa98039bec721"}, - {file = "cyclonedx_python_lib-8.3.0.tar.gz", hash = "sha256:d60f6060ad11a5a77ccbf7827acc16a40741f00c97f0ab21201617cd1fc44a7d"}, + {file = "cyclonedx_python_lib-8.4.0-py3-none-any.whl", hash = "sha256:fd44efd601f651c8865acf0dfeacb0df19a2b50ec69ead0262096fd2f67197b9"}, + {file = "cyclonedx_python_lib-8.4.0.tar.gz", hash = "sha256:1d86efc1e81c0fd01141658b8aed5248c4f4d8d300d7ced9e1dfc39abeafc0a9"}, ] [package.dependencies] @@ -1803,4 +1803,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "^3.9.0" -content-hash = "ce00ba57b9f453b46c329c1221099994544b3e77f02b3f6ebe21fdcd4a87dd0d" +content-hash = "4be8753c82249f9f62bdd0da23e86f55e34b3409dd69f7c81a35edff4077dccd" diff --git a/pyproject.toml b/pyproject.toml index 19afb5fa..42418ffb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ pyicu = [ ] natsort = "^8.4.0" univers = "30.12.1" -cyclonedx-python-lib = "8.3.0" +cyclonedx-python-lib = "8.4.0" [tool.poetry.group.dev.dependencies] flake8 = "7.1.1" From d546945ff27e571e276ea5ef473fbc2bdb8b43be Mon Sep 17 00:00:00 2001 From: Aleg Vilinski <58322186+italvi@users.noreply.github.com> Date: Mon, 4 Nov 2024 07:13:44 +0100 Subject: [PATCH 2/3] refactor: remove not required warnings filter after update of cyclonedx-python-lib --- cdxev/initialize_sbom.py | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/cdxev/initialize_sbom.py b/cdxev/initialize_sbom.py index 6a5a7c88..6ddad227 100644 --- a/cdxev/initialize_sbom.py +++ b/cdxev/initialize_sbom.py @@ -95,20 +95,16 @@ def initialize_sbom( component=metadata_component, timestamp=timestamp, ) - with warnings.catch_warnings(): - warnings.simplefilter("ignore") - # ignore warning caused by absence of components - # required due to an implementation in the cyclonedx-python-lib - # https://github.com/CycloneDX/cyclonedx-python-lib/issues/617 - sbom = Bom( - version=1, - metadata=metadata, - dependencies=[Dependency(bom_ref, dependencies=[])], - ) - - my_json_outputter = JsonV1Dot6(sbom) - serialized_json: dict[str, Any] = json.loads( - my_json_outputter.output_as_string(indent=4) - ) + + sbom = Bom( + version=1, + metadata=metadata, + dependencies=[Dependency(bom_ref, dependencies=[])], + ) + + my_json_outputter = JsonV1Dot6(sbom) + serialized_json: dict[str, Any] = json.loads( + my_json_outputter.output_as_string(indent=4) + ) return serialized_json From 1b182d7edd3cadff5e542b4dce52a2d6fe41a705 Mon Sep 17 00:00:00 2001 From: Aleg Vilinski <58322186+italvi@users.noreply.github.com> Date: Mon, 4 Nov 2024 07:17:50 +0100 Subject: [PATCH 3/3] refactor: remove not required warnings lib --- cdxev/initialize_sbom.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cdxev/initialize_sbom.py b/cdxev/initialize_sbom.py index 6ddad227..9e05b4ec 100644 --- a/cdxev/initialize_sbom.py +++ b/cdxev/initialize_sbom.py @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later import json -import warnings from datetime import datetime from typing import Any, Union