diff --git a/textproc/py-cyclonedx-python-lib/Makefile b/textproc/py-cyclonedx-python-lib/Makefile index b16249dd9b2c..2e93f6c847f0 100644 --- a/textproc/py-cyclonedx-python-lib/Makefile +++ b/textproc/py-cyclonedx-python-lib/Makefile @@ -1,37 +1,37 @@ PORTNAME= cyclonedx-python-lib -PORTVERSION= 8.9.0 +PORTVERSION= 9.1.0 CATEGORIES= textproc python MASTER_SITES= PYPI \ https://github.com/CycloneDX/cyclonedx-python-lib/releases/download/v${PORTVERSION}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= cyclonedx_python_lib-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Library for producing CycloneDX SBOM (Software Bill of Materials) files WWW= https://github.com/CycloneDX/cyclonedx-python-lib LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}license-expression>=30<31:textproc/py-license-expression@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packageurl-python>=0.11<2:textproc/py-packageurl-python@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}py-serializable>=2.0.0<3:devel/py-py-serializable@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=2.4.0<3:devel/py-sortedcontainers@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes OPTIONS_DEFINE= JSON_VALIDATION VALIDATION XML_VALIDATION JSON_VALIDATION_DESC= JSON validation VALIDATION_DESC= JSON and XML validation XML_VALIDATION_DESC= XML validation JSON_VALIDATION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=4.18<5:devel/py-jsonschema@${PY_FLAVOR} VALIDATION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=4.18<5:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=4<6:devel/py-lxml@${PY_FLAVOR} XML_VALIDATION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4<6:devel/py-lxml@${PY_FLAVOR} .include diff --git a/textproc/py-cyclonedx-python-lib/distinfo b/textproc/py-cyclonedx-python-lib/distinfo index 7e158e6563b2..773084af85b4 100644 --- a/textproc/py-cyclonedx-python-lib/distinfo +++ b/textproc/py-cyclonedx-python-lib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1740836182 -SHA256 (cyclonedx_python_lib-8.9.0.tar.gz) = 112c6e6e5290420e32026c49b8391645bf3e646c7602f7bdb5d02c6febbaa073 -SIZE (cyclonedx_python_lib-8.9.0.tar.gz) = 1046896 +TIMESTAMP = 1742070472 +SHA256 (cyclonedx_python_lib-9.1.0.tar.gz) = 86935f2c88a7b47a529b93c724dbd3e903bc573f6f8bd977628a7ca1b5dadea1 +SIZE (cyclonedx_python_lib-9.1.0.tar.gz) = 1048735 diff --git a/textproc/py-cyclonedx-python-lib/files/patch-py-serializable b/textproc/py-cyclonedx-python-lib/files/patch-py-serializable deleted file mode 100644 index 528fbdfe1a92..000000000000 --- a/textproc/py-cyclonedx-python-lib/files/patch-py-serializable +++ /dev/null @@ -1,232 +0,0 @@ -Obtained from: https://github.com/CycloneDX/cyclonedx-python-lib/commit/7c20c8e44fbc3de2942dd2f2ad298be2bd17614b - ---- cyclonedx/model/__init__.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/__init__.py -@@ -33,7 +33,7 @@ from xml.etree.ElementTree import Element as XmlElemen - from warnings import warn - from xml.etree.ElementTree import Element as XmlElement # nosec B405 - --import serializable -+import py_serializable as serializable - from sortedcontainers import SortedSet - - from .._internal.compare import ComparableTuple as _ComparableTuple ---- cyclonedx/model/bom_ref.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/bom_ref.py -@@ -18,7 +18,7 @@ from typing import TYPE_CHECKING, Any, Optional - - from typing import TYPE_CHECKING, Any, Optional - --import serializable -+import py_serializable as serializable - - from ..exception.serialization import CycloneDxDeserializationException, SerializationOfUnexpectedValueException - ---- cyclonedx/model/bom.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/bom.py -@@ -22,7 +22,7 @@ from warnings import warn - from uuid import UUID, uuid4 - from warnings import warn - --import serializable -+import py_serializable as serializable - from sortedcontainers import SortedSet - - from .._internal.time import get_now_utc as _get_now_utc ---- cyclonedx/model/component.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/component.py -@@ -22,7 +22,7 @@ from warnings import warn - from warnings import warn - - # See https://github.com/package-url/packageurl-python/issues/65 --import serializable -+import py_serializable as serializable - from packageurl import PackageURL - from sortedcontainers import SortedSet - ---- cyclonedx/model/contact.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/contact.py -@@ -18,7 +18,7 @@ from typing import Any, Iterable, Optional, Union - - from typing import Any, Iterable, Optional, Union - --import serializable -+import py_serializable as serializable - from sortedcontainers import SortedSet - - from .._internal.bom_ref import bom_ref_from_str as _bom_ref_from_str ---- cyclonedx/model/crypto.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/crypto.py -@@ -29,7 +29,7 @@ from typing import Any, Iterable, Optional - from enum import Enum - from typing import Any, Iterable, Optional - --import serializable -+import py_serializable as serializable - from sortedcontainers import SortedSet - - from .._internal.compare import ComparableTuple as _ComparableTuple ---- cyclonedx/model/definition.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/definition.py -@@ -18,7 +18,7 @@ from typing import TYPE_CHECKING, Any, Iterable, Optio - import re - from typing import TYPE_CHECKING, Any, Iterable, Optional, Union - --import serializable -+import py_serializable as serializable - from sortedcontainers import SortedSet - - from .._internal.bom_ref import bom_ref_from_str as _bom_ref_from_str ---- cyclonedx/model/dependency.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/dependency.py -@@ -19,7 +19,7 @@ from typing import Any, Iterable, List, Optional, Set - from abc import ABC, abstractmethod - from typing import Any, Iterable, List, Optional, Set - --import serializable -+import py_serializable as serializable - from sortedcontainers import SortedSet - - from .._internal.compare import ComparableTuple as _ComparableTuple ---- cyclonedx/model/impact_analysis.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/impact_analysis.py -@@ -28,7 +28,7 @@ from enum import Enum - - from enum import Enum - --import serializable -+import py_serializable as serializable - - - @serializable.serializable_enum ---- cyclonedx/model/issue.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/issue.py -@@ -18,7 +18,7 @@ from typing import Any, Iterable, Optional - from enum import Enum - from typing import Any, Iterable, Optional - --import serializable -+import py_serializable as serializable - from sortedcontainers import SortedSet - - from .._internal.compare import ComparableTuple as _ComparableTuple ---- cyclonedx/model/license.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/license.py -@@ -26,7 +26,7 @@ from xml.etree.ElementTree import Element # nosec B40 - from warnings import warn - from xml.etree.ElementTree import Element # nosec B405 - --import serializable -+import py_serializable as serializable - from sortedcontainers import SortedSet - - from .._internal.compare import ComparableTuple as _ComparableTuple ---- cyclonedx/model/lifecycle.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/lifecycle.py -@@ -30,15 +30,15 @@ from xml.etree.ElementTree import Element # nosec B40 - from typing import TYPE_CHECKING, Any, Dict, List, Optional, Type, Union - from xml.etree.ElementTree import Element # nosec B405 - --import serializable --from serializable.helpers import BaseHelper -+import py_serializable as serializable -+from py_serializable.helpers import BaseHelper - from sortedcontainers import SortedSet - - from .._internal.compare import ComparableTuple as _ComparableTuple - from ..exception.serialization import CycloneDxDeserializationException - - if TYPE_CHECKING: # pragma: no cover -- from serializable import ViewType -+ from py_serializable import ViewType - - - @serializable.serializable_enum ---- cyclonedx/model/release_note.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/release_note.py -@@ -18,7 +18,7 @@ from typing import Iterable, Optional - from datetime import datetime - from typing import Iterable, Optional - --import serializable -+import py_serializable as serializable - from sortedcontainers import SortedSet - - from ..model import Note, Property, XsUri ---- cyclonedx/model/service.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/service.py -@@ -26,7 +26,7 @@ from typing import Any, Iterable, Optional, Union - - from typing import Any, Iterable, Optional, Union - --import serializable -+import py_serializable as serializable - from sortedcontainers import SortedSet - - from .._internal.bom_ref import bom_ref_from_str as _bom_ref_from_str ---- cyclonedx/model/tool.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/tool.py -@@ -21,8 +21,8 @@ from xml.etree.ElementTree import Element # nosec B40 - from warnings import warn - from xml.etree.ElementTree import Element # nosec B405 - --import serializable --from serializable.helpers import BaseHelper -+import py_serializable as serializable -+from py_serializable.helpers import BaseHelper - from sortedcontainers import SortedSet - - from .._internal.compare import ComparableTuple as _ComparableTuple -@@ -33,7 +33,7 @@ if TYPE_CHECKING: # pragma: no cover - from .service import Service - - if TYPE_CHECKING: # pragma: no cover -- from serializable import ObjectMetadataLibrary, ViewType -+ from py_serializable import ObjectMetadataLibrary, ViewType - - - @serializable.serializable_class ---- cyclonedx/model/vulnerability.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/model/vulnerability.py -@@ -35,7 +35,7 @@ from typing import Any, Dict, FrozenSet, Iterable, Opt - from enum import Enum - from typing import Any, Dict, FrozenSet, Iterable, Optional, Tuple, Type, Union - --import serializable -+import py_serializable as serializable - from sortedcontainers import SortedSet - - from .._internal.bom_ref import bom_ref_from_str as _bom_ref_from_str ---- cyclonedx/schema/schema.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/schema/schema.py -@@ -18,7 +18,7 @@ from typing import Dict, Literal, Type - from abc import ABC, abstractmethod - from typing import Dict, Literal, Type - --from serializable import ViewType -+from py_serializable import ViewType - - from . import SchemaVersion - ---- cyclonedx/serialization/__init__.py.orig 1970-01-01 00:00:00 UTC -+++ cyclonedx/serialization/__init__.py -@@ -25,7 +25,7 @@ from packageurl import PackageURL - - # See https://github.com/package-url/packageurl-python/issues/65 - from packageurl import PackageURL --from serializable.helpers import BaseHelper -+from py_serializable.helpers import BaseHelper - - from ..exception.serialization import CycloneDxDeserializationException, SerializationOfUnexpectedValueException - from ..model.bom_ref import BomRef ---- pyproject.toml.orig 1970-01-01 00:00:00 UTC -+++ pyproject.toml -@@ -70,7 +70,7 @@ packageurl-python = ">=0.11, <2" - [tool.poetry.dependencies] - python = "^3.8" - packageurl-python = ">=0.11, <2" --py-serializable = "^1.1.1" -+py-serializable = "^2.0.0" - sortedcontainers = "^2.4.0" - license-expression = "^30" - jsonschema = { version = "^4.18", extras=['format'], optional=true }