diff options
| -rw-r--r-- | src/hydrilla/builder/build.py | 7 | ||||
| m--------- | src/hydrilla/schemas | 0 | ||||
| m--------- | src/test/source-package-example | 0 | ||||
| -rw-r--r-- | src/test/test_hydrilla_builder.py | 8 |
4 files changed, 12 insertions, 3 deletions
diff --git a/src/hydrilla/builder/build.py b/src/hydrilla/builder/build.py index 58fe1b2..2824e9b 100644 --- a/src/hydrilla/builder/build.py +++ b/src/hydrilla/builder/build.py @@ -253,9 +253,10 @@ class Build: Return a minimal item reference suitable for using in source description. """ - copy_props = ['type', 'identifier', 'long_name', 'uuid', 'description'] - if 'comment' in item_def: - copy_props.append('comment') + copy_props = ['type', 'identifier', 'long_name', 'description'] + for prop in ('comment', 'uuid'): + if prop in item_def: + copy_props.append(prop) if item_def['type'] == 'resource': item_list = self.resource_list diff --git a/src/hydrilla/schemas b/src/hydrilla/schemas -Subproject 1d1c93d5a9011ecdf58a4952afcb5a1faff30e7 +Subproject 5ef63e81ddd7299bfb738cae643bc48560b68a1 diff --git a/src/test/source-package-example b/src/test/source-package-example -Subproject 48606f288c89aaadb28a021ab71945e1e87fd14 +Subproject 92a4d31c659b2336e5e188877d1ce6bfad2fa31 diff --git a/src/test/test_hydrilla_builder.py b/src/test/test_hydrilla_builder.py index c8d29f1..93392db 100644 --- a/src/test/test_hydrilla_builder.py +++ b/src/test/test_hydrilla_builder.py @@ -273,6 +273,14 @@ def modify_index_good(settings: CaseSettings, obj: dict) -> None: settings.expected_mapping['payloads'] = {} + # Don't use UUIDs (they are optional) + for definition in obj['definitions']: + del definition['uuid'] + + for description in settings.expected(): + if 'uuid' in description: + del description['uuid'] + # Add some unrecognized properties that should be stripped to_process = [obj] while to_process: |