Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps)!: py-serializable==^1.1.1 -> ^2.0.0 #775

Merged
merged 1 commit into from
Feb 11, 2025
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
chore(deps): py-serializable==^1.1.1 -> ^2.0.0
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
  • Loading branch information
jkowalleck committed Feb 9, 2025
commit b03cfa6d02adc7a5d4c4f953b52e01be46d43093
2 changes: 1 addition & 1 deletion cyclonedx/model/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/model/bom.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/model/bom_ref.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

from typing import TYPE_CHECKING, Any, Optional

import serializable
import py_serializable as serializable

from ..exception.serialization import CycloneDxDeserializationException, SerializationOfUnexpectedValueException

Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/model/component.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
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

Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/model/contact.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

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
Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/model/crypto.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/model/definition.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/model/dependency.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/model/impact_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

from enum import Enum

import serializable
import py_serializable as serializable


@serializable.serializable_enum
Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/model/issue.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/model/license.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
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
Expand Down
6 changes: 3 additions & 3 deletions cyclonedx/model/lifecycle.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
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
Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/model/release_note.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/model/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

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
Expand Down
6 changes: 3 additions & 3 deletions cyclonedx/model/tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
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
Expand All @@ -33,7 +33,7 @@
from .service import Service

if TYPE_CHECKING: # pragma: no cover
from serializable import ObjectMetadataLibrary, ViewType
from py_serializable import ObjectMetadataLibrary, ViewType


@serializable.serializable_class
Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/model/vulnerability.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/schema/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from abc import ABC, abstractmethod
from typing import Dict, Literal, Type

from serializable import ViewType
from py_serializable import ViewType

from . import SchemaVersion

Expand Down
2 changes: 1 addition & 1 deletion cyclonedx/serialization/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

# 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
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ keywords = [
[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 }
Expand Down