From 02035d94aa77b988c9e0d561524fad4687ca0dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Fri, 30 Sep 2022 12:45:08 +0200 Subject: [PATCH] metadata: sort json output ensures the files don't change arbitrarily --- Tools/module_config/generate_actuators_metadata.py | 2 +- src/lib/component_information/generate_component_general.py | 2 +- src/lib/parameters/px4params/jsonout.py | 2 +- src/lib/parameters/px_generate_params.py | 1 - src/lib/parameters/px_process_params.py | 2 -- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Tools/module_config/generate_actuators_metadata.py b/Tools/module_config/generate_actuators_metadata.py index bc6a46cf4e..089e4585ed 100755 --- a/Tools/module_config/generate_actuators_metadata.py +++ b/Tools/module_config/generate_actuators_metadata.py @@ -489,7 +489,7 @@ actuators = { with open(output_file, 'w') as outfile: indent = 2 if verbose else None - json.dump(actuators, outfile, indent=indent) + json.dump(actuators, outfile, indent=indent, sort_keys=True) if compress: save_compressed(output_file) diff --git a/src/lib/component_information/generate_component_general.py b/src/lib/component_information/generate_component_general.py index 964302f355..35445f1b88 100755 --- a/src/lib/component_information/generate_component_general.py +++ b/src/lib/component_information/generate_component_general.py @@ -74,7 +74,7 @@ for metadata_type_tuple in args.type: component_general['metadataTypes'] = metadata_types with open(filename, 'w') as outfile: - json.dump(component_general, outfile) + json.dump(component_general, outfile, sort_keys=True) if compress: save_compressed(filename) diff --git a/src/lib/parameters/px4params/jsonout.py b/src/lib/parameters/px4params/jsonout.py index a8052e0f37..6e3338b980 100644 --- a/src/lib/parameters/px4params/jsonout.py +++ b/src/lib/parameters/px4params/jsonout.py @@ -114,7 +114,7 @@ class JsonOutput(): #Json string output. - self.output = json.dumps(all_json,indent=2) + self.output = json.dumps(all_json, indent=2, sort_keys=True) def Save(self, filename): diff --git a/src/lib/parameters/px_generate_params.py b/src/lib/parameters/px_generate_params.py index 559b08e4d2..eeab2e2494 100755 --- a/src/lib/parameters/px_generate_params.py +++ b/src/lib/parameters/px_generate_params.py @@ -4,7 +4,6 @@ Param source code generation script. """ from __future__ import print_function import xml.etree.ElementTree as ET -import codecs import argparse import sys diff --git a/src/lib/parameters/px_process_params.py b/src/lib/parameters/px_process_params.py index 59f041c680..feefa684c8 100755 --- a/src/lib/parameters/px_process_params.py +++ b/src/lib/parameters/px_process_params.py @@ -50,9 +50,7 @@ import argparse from px4params import srcscanner, srcparser, injectxmlparams, xmlout, markdownout, jsonout import lzma #to create .xz file -import re import json -import codecs def save_compressed(filename): #create lzma compressed version