From 02af50f1214c9f653aecb21f1e4c8613ef42fdd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Barth=C3=A9l=C3=A9my?= Date: Thu, 28 Jan 2021 10:02:25 +0100 Subject: [PATCH 1/2] let qitoolchain make-package obey the --quiet flag --- python/qitoolchain/actions/make_package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/qitoolchain/actions/make_package.py b/python/qitoolchain/actions/make_package.py index 5f7a1d84a..150bc15a8 100644 --- a/python/qitoolchain/actions/make_package.py +++ b/python/qitoolchain/actions/make_package.py @@ -69,6 +69,6 @@ def do(args): parts = [name, version, target] archive_name = "-".join(parts) + ".zip" output = os.path.join(output, archive_name) - res = qisys.archive.compress(input_directory, flat=True, output=output) + res = qisys.archive.compress(input_directory, flat=True, output=output, quiet=args.quiet) ui.info(ui.green, "Package generated in", res) return res From 8cc36fcf55bf516628c249349a59e98d41df55ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Barth=C3=A9l=C3=A9my?= Date: Thu, 28 Jan 2021 10:10:26 +0100 Subject: [PATCH 2/2] qitest: rm useless rewriting of the env This fix avoids RuntimeError: dictionary keys changed during iteration when using qitest run -j n with n > 1 on python-3.8. --- python/qitest/conf.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/python/qitest/conf.py b/python/qitest/conf.py index 4ff748152..6df58503c 100644 --- a/python/qitest/conf.py +++ b/python/qitest/conf.py @@ -41,13 +41,6 @@ def parse_tests(conf_path): res = list() with open(conf_path, "r") as fp: res = json.load(fp) - # Make sure environment is a dict string -> string - for test in res: - test_env = test.get("environment") - if test_env: - for key, value in test_env.items(): - del test_env[key] - test_env[key] = value return res