From fb3900d25291be2ff8f377da7d9f7d05e2968a07 Mon Sep 17 00:00:00 2001 From: Sarah GLINER Date: Mon, 27 Nov 2023 14:42:18 +0100 Subject: [PATCH] merge_json: fix mypy --- scripts/build_and_test/__init__.py | 2 +- scripts/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build_and_test/__init__.py b/scripts/build_and_test/__init__.py index ad5ae69..5bc7c84 100644 --- a/scripts/build_and_test/__init__.py +++ b/scripts/build_and_test/__init__.py @@ -93,7 +93,7 @@ def main(args: Namespace) -> None: build_output.append(scan_app) logs += log - output = merge_json(build_output, {}, "name") + output = merge_json(build_output, [], "name") with open(args.output_file, 'w') as json_file: json.dump(output, json_file, indent=1) diff --git a/scripts/utils.py b/scripts/utils.py index f2403d1..896c940 100644 --- a/scripts/utils.py +++ b/scripts/utils.py @@ -56,7 +56,7 @@ def git_setup(repo_name: str, repo_ref: str, repo_url: str, workdir: Path) -> No return -def merge_json(json1: dict, json2: dict, key: str) -> List: +def merge_json(json1: list, json2: list, key: str) -> List: merged_data = [] for obj1 in json1: