Skip to content

Commit b10dc83

Browse files
authored
bc: remove const output.LATEST_SUPPORTED_SCHEMA_VERSION (#494)
Signed-off-by: Jan Kowalleck <[email protected]>
1 parent e9cc5ee commit b10dc83

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

cyclonedx/output/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
from .json import Json as JsonOutputter
3434
from .xml import Xml as XmlOutputter
3535

36-
LATEST_SUPPORTED_SCHEMA_VERSION = SchemaVersion.V1_5
37-
3836

3937
class BaseOutput(ABC):
4038

examples/complex.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
from cyclonedx.model import OrganizationalEntity, XsUri
2525
from cyclonedx.model.bom import Bom
2626
from cyclonedx.model.component import Component, ComponentType
27-
from cyclonedx.output import make_outputter, LATEST_SUPPORTED_SCHEMA_VERSION
28-
from cyclonedx.output.json import JsonV1Dot4
27+
from cyclonedx.output import make_outputter
28+
from cyclonedx.output.json import JsonV1Dot5
2929
from cyclonedx.schema import SchemaVersion, OutputFormat
3030
from cyclonedx.validation.json import JsonStrictValidator
3131
from cyclonedx.validation import make_schemabased_validator
@@ -79,10 +79,10 @@
7979
# region JSON
8080
"""demo with explicit instructions for SchemaVersion, outputter and validator"""
8181

82-
my_json_outputter: 'JsonOutputter' = JsonV1Dot4(bom)
82+
my_json_outputter: 'JsonOutputter' = JsonV1Dot5(bom)
8383
serialized_json = my_json_outputter.output_as_string(indent=2)
8484
print(serialized_json)
85-
my_json_validator = JsonStrictValidator(SchemaVersion.V1_4)
85+
my_json_validator = JsonStrictValidator(SchemaVersion.V1_5)
8686
try:
8787
validation_errors = my_json_validator.validate_str(serialized_json)
8888
if validation_errors:
@@ -99,7 +99,7 @@
9999
# region XML
100100
"""demo with implicit instructions for SchemaVersion, outputter and validator. TypeCheckers will catch errors."""
101101

102-
my_xml_outputter: 'XmlOutputter' = make_outputter(bom, OutputFormat.XML, LATEST_SUPPORTED_SCHEMA_VERSION)
102+
my_xml_outputter: 'XmlOutputter' = make_outputter(bom, OutputFormat.XML, SchemaVersion.V1_5)
103103
serialized_xml = my_xml_outputter.output_as_string(indent=2)
104104
print(serialized_xml)
105105
my_xml_validator: 'XmlValidator' = make_schemabased_validator(

tests/test_deserialize_json.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
from cyclonedx.model.bom import Bom
2828
from cyclonedx.model.license import DisjunctiveLicense, LicenseExpression, LicenseRepository
29-
from cyclonedx.output import LATEST_SUPPORTED_SCHEMA_VERSION
3029
from cyclonedx.schema import OutputFormat, SchemaVersion
3130
from tests import OWN_DATA_DIRECTORY, DeepCompareMixin, SnapshotMixin, mksname, uuid_generator
3231
from tests._data.models import all_get_bom_funct_valid, all_get_bom_funct_with_incomplete_deps
@@ -40,7 +39,7 @@ class TestDeserializeJson(TestCase, SnapshotMixin, DeepCompareMixin):
4039
@patch('cyclonedx.model.bom_ref.uuid4', side_effect=uuid_generator(0, version=4))
4140
def test_prepared(self, get_bom: Callable[[], Bom], *_: Any, **__: Any) -> None:
4241
# only latest schema will have all data populated in serialized form
43-
snapshot_name = mksname(get_bom, LATEST_SUPPORTED_SCHEMA_VERSION, OutputFormat.JSON)
42+
snapshot_name = mksname(get_bom, SchemaVersion.V1_5, OutputFormat.JSON)
4443
expected = get_bom()
4544
json = json_loads(self.readSnapshot(snapshot_name))
4645
bom = Bom.from_json(json)

tests/test_deserialize_xml.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
from ddt import ddt, named_data
2424

2525
from cyclonedx.model.bom import Bom
26-
from cyclonedx.output import LATEST_SUPPORTED_SCHEMA_VERSION
27-
from cyclonedx.schema import OutputFormat
26+
from cyclonedx.schema import OutputFormat, SchemaVersion
2827
from tests import DeepCompareMixin, SnapshotMixin, mksname, uuid_generator
2928
from tests._data.models import all_get_bom_funct_valid, all_get_bom_funct_with_incomplete_deps
3029

@@ -37,7 +36,7 @@ class TestDeserializeXml(TestCase, SnapshotMixin, DeepCompareMixin):
3736
@patch('cyclonedx.model.bom_ref.uuid4', side_effect=uuid_generator(0, version=4))
3837
def test_prepared(self, get_bom: Callable[[], Bom], *_: Any, **__: Any) -> None:
3938
# only latest schema will have all data populated in serialized form
40-
snapshot_name = mksname(get_bom, LATEST_SUPPORTED_SCHEMA_VERSION, OutputFormat.XML)
39+
snapshot_name = mksname(get_bom, SchemaVersion.V1_5, OutputFormat.XML)
4140
expected = get_bom()
4241
with open(self.getSnapshotFile(snapshot_name), 'r') as s:
4342
bom = Bom.from_xml(s)

0 commit comments

Comments
 (0)