From 92554a8a05b52ee0e97be5f2f620715b3f1e502f Mon Sep 17 00:00:00 2001 From: Thibault <70470823+ThibFrgsGmz@users.noreply.github.com> Date: Sun, 5 Jun 2022 21:56:11 +0200 Subject: [PATCH 1/6] Swap if-expr to remove negation --- src/fprime/fbuild/cmake.py | 4 +++- src/fprime/util/string_util.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fprime/fbuild/cmake.py b/src/fprime/fbuild/cmake.py index bc6e3690..faacfaa9 100644 --- a/src/fprime/fbuild/cmake.py +++ b/src/fprime/fbuild/cmake.py @@ -108,7 +108,9 @@ def execute_known_target( cmake_target = ( module if target == "" - else (f"{module}_{target}".lstrip("_") if not top_target else target) + else target + if top_target + else f"{module}_{target}".lstrip("_") ) run_args = ["--build", build_dir] environment = {} if environment is None else copy.copy(environment) diff --git a/src/fprime/util/string_util.py b/src/fprime/util/string_util.py index 00ad8fdc..616ff9ae 100644 --- a/src/fprime/util/string_util.py +++ b/src/fprime/util/string_util.py @@ -66,7 +66,7 @@ def convert(match_obj, ignore_int): elif all([not ignore_int, str(conversion_type).lower() == "d"]): format_template += f"{conversion_type}" - return "{}" if not format_template else "{:" + format_template + "}" + return "{:" + format_template + "}" if format_template else "{}" def convert_include_all(match_obj): return convert(match_obj, ignore_int=False) From 64a6dfcb7f8f72c4276bcc7ddef8d6f341d20cbc Mon Sep 17 00:00:00 2001 From: Thibault <70470823+ThibFrgsGmz@users.noreply.github.com> Date: Sun, 5 Jun 2022 21:57:07 +0200 Subject: [PATCH 2/6] Remove unneeded fstring format --- src/fprime/fbuild/gcovr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fprime/fbuild/gcovr.py b/src/fprime/fbuild/gcovr.py index 3c200580..a107f94e 100644 --- a/src/fprime/fbuild/gcovr.py +++ b/src/fprime/fbuild/gcovr.py @@ -273,7 +273,7 @@ def execute( "--print-summary", "--txt", f"{coverage_output_dir}/summary.txt", - f"--html-details", + "--html-details", f"{coverage_output_dir}/coverage{'-all' if self.scope == TargetScope.GLOBAL else ''}.html", ] cli_args.extend(args[1]) From deef13675a665787f78dc2f37a233b69c6519492 Mon Sep 17 00:00:00 2001 From: Thibault <70470823+ThibFrgsGmz@users.noreply.github.com> Date: Sun, 5 Jun 2022 22:02:50 +0200 Subject: [PATCH 3/6] rm another unneeded f-string --- test/fprime/common/models/serialize/test_types.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fprime/common/models/serialize/test_types.py b/test/fprime/common/models/serialize/test_types.py index 8c24ef53..86a1dd56 100644 --- a/test/fprime/common/models/serialize/test_types.py +++ b/test/fprime/common/models/serialize/test_types.py @@ -312,7 +312,7 @@ def test_serializable_basic_off_nominal(): ("member2", StringType.construct_type("StringMember1", max_length=10), "%s"), ] serializable_type = SerializableType.construct_type( - f"BasicInvalidSerializable", member_list + "BasicInvalidSerializable", member_list ) invalid_values = [ From b79731b20e961a687327106facfb1627968e9239 Mon Sep 17 00:00:00 2001 From: Thibault <70470823+ThibFrgsGmz@users.noreply.github.com> Date: Sun, 5 Jun 2022 22:05:16 +0200 Subject: [PATCH 4/6] More concise dict creation --- src/fprime/common/models/serialize/serializable_type.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fprime/common/models/serialize/serializable_type.py b/src/fprime/common/models/serialize/serializable_type.py index 8367a33b..997016a2 100644 --- a/src/fprime/common/models/serialize/serializable_type.py +++ b/src/fprime/common/models/serialize/serializable_type.py @@ -112,7 +112,7 @@ def formatted_val(self) -> dict: Note 2: If a member is an array will call array formatted_val :return a formatted dict """ - result = dict() + result = {} for member_name, _, member_format, _ in self.MEMBER_LIST: value_object = self._val[member_name] if isinstance(value_object, (array_type.ArrayType, SerializableType)): From 6b7c949ded559284acd5fbd6dcbd18d13c0b67d5 Mon Sep 17 00:00:00 2001 From: Thibault <70470823+ThibFrgsGmz@users.noreply.github.com> Date: Wed, 8 Jun 2022 21:49:41 +0200 Subject: [PATCH 5/6] revise nested ternary operator --- src/fprime/fbuild/cmake.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/fprime/fbuild/cmake.py b/src/fprime/fbuild/cmake.py index faacfaa9..fe4c0c71 100644 --- a/src/fprime/fbuild/cmake.py +++ b/src/fprime/fbuild/cmake.py @@ -105,13 +105,13 @@ def execute_known_target( cmake_target = target else: module = self.get_cmake_module(path, build_dir) - cmake_target = ( - module - if target == "" - else target - if top_target - else f"{module}_{target}".lstrip("_") - ) + if target == "": + cmake_target = module + elif top_target: + cmake_target = target + else: + cmake_target = f"{module}_{target}".lstrip("_") + run_args = ["--build", build_dir] environment = {} if environment is None else copy.copy(environment) if self.verbose: From 1a390979f2c426199cd334ec858722ce05b2e464 Mon Sep 17 00:00:00 2001 From: Thibault <70470823+ThibFrgsGmz@users.noreply.github.com> Date: Wed, 8 Jun 2022 21:51:50 +0200 Subject: [PATCH 6/6] black formatting --- src/fprime/fbuild/cmake.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fprime/fbuild/cmake.py b/src/fprime/fbuild/cmake.py index fe4c0c71..f9df9f42 100644 --- a/src/fprime/fbuild/cmake.py +++ b/src/fprime/fbuild/cmake.py @@ -111,7 +111,7 @@ def execute_known_target( cmake_target = target else: cmake_target = f"{module}_{target}".lstrip("_") - + run_args = ["--build", build_dir] environment = {} if environment is None else copy.copy(environment) if self.verbose: