diff options
| author | Wojtek Kosior <koszko@koszko.org> | 2022-03-08 16:13:36 +0100 |
|---|---|---|
| committer | Wojtek Kosior <koszko@koszko.org> | 2022-03-08 16:13:36 +0100 |
| commit | 2938a9d10e5464132b51cc95cf0e9d3ee38c01fd (patch) | |
| tree | e2515b949d15e75a0139f43203d77a5bbe087a20 | |
| parent | 363cbbb6a9fac49a377d8fa13ffede1483feabd5 (diff) | |
| download | hydrilla-builder-2938a9d10e5464132b51cc95cf0e9d3ee38c01fd.tar.gz hydrilla-builder-2938a9d10e5464132b51cc95cf0e9d3ee38c01fd.zip | |
don't include schema patch version number in generated instancesv1.0-beta2
| -rw-r--r-- | src/hydrilla/builder/build.py | 4 | ||||
| -rw-r--r-- | src/test/test_hydrilla_builder.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/hydrilla/builder/build.py b/src/hydrilla/builder/build.py index 1cf2ca8..8e78764 100644 --- a/src/hydrilla/builder/build.py +++ b/src/hydrilla/builder/build.py @@ -290,7 +290,7 @@ class Build: new_item_obj.update([(p, item_def[p]) for p in copy_props]) new_item_obj['version'] = util.normalize_version(item_def['version']) - new_item_obj['$schema'] = f'{schemas_root}/api_{item_def["type"]}_description-1.0.1.schema.json' + new_item_obj['$schema'] = f'{schemas_root}/api_{item_def["type"]}_description-1.schema.json' new_item_obj['source_copyright'] = self.copyright_file_refs new_item_obj['source_name'] = self.source_name new_item_obj['generated_by'] = generated_by @@ -309,7 +309,7 @@ class Build: """ index_validator.validate(index_obj) - schema = f'{schemas_root}/api_source_description-1.0.1.schema.json' + schema = f'{schemas_root}/api_source_description-1.schema.json' self.source_name = index_obj['source_name'] diff --git a/src/test/test_hydrilla_builder.py b/src/test/test_hydrilla_builder.py index bee77a2..851b5cd 100644 --- a/src/test/test_hydrilla_builder.py +++ b/src/test/test_hydrilla_builder.py @@ -65,7 +65,7 @@ class CaseSettings: self.contents = default_contents.copy() self.expected_resources = [{ - '$schema': 'https://hydrilla.koszko.org/schemas/api_resource_description-1.0.1.schema.json', + '$schema': 'https://hydrilla.koszko.org/schemas/api_resource_description-1.schema.json', 'source_name': 'hello', 'source_copyright': [{ 'file': 'report.spdx', @@ -91,7 +91,7 @@ class CaseSettings: }], 'generated_by': expected_generated_by }, { - '$schema': 'https://hydrilla.koszko.org/schemas/api_resource_description-1.0.1.schema.json', + '$schema': 'https://hydrilla.koszko.org/schemas/api_resource_description-1.schema.json', 'source_name': 'hello', 'source_copyright': [{ 'file': 'report.spdx', @@ -115,7 +115,7 @@ class CaseSettings: 'generated_by': expected_generated_by }] self.expected_mapping = { - '$schema': 'https://hydrilla.koszko.org/schemas/api_mapping_description-1.0.1.schema.json', + '$schema': 'https://hydrilla.koszko.org/schemas/api_mapping_description-1.schema.json', 'source_name': 'hello', 'source_copyright': [{ 'file': 'report.spdx', @@ -141,7 +141,7 @@ class CaseSettings: 'generated_by': expected_generated_by } self.expected_source_description = { - '$schema': 'https://hydrilla.koszko.org/schemas/api_source_description-1.0.1.schema.json', + '$schema': 'https://hydrilla.koszko.org/schemas/api_source_description-1.schema.json', 'source_name': 'hello', 'source_copyright': [{ 'file': 'report.spdx', |