commit f6aa3da9dafebe0bc210d4b78fa05a21a061f13b
author Dean Birch <dean.birch@arm.com> Fri Jan 24 12:29:38 2020 +0000
committer Dean Birch <dean.birch@arm.com> Thu May 28 09:10:26 2020 +0100
tree ca8435f9284be6994927a42a9537da50c03a42ec
parent 5cb5a880c126f5b148d029db159072c2e66a6158

Increase compatibility

As configs.py may be run by CI systems without the full python
requirements needed by the build, this aims to increase the
compatibility.

* xmltodict only required by one function in the utils.py, but it was
only used by the report parser, so moved that to the report parser.
* Changed some lines combining dictionaries to be python 2 and 3
compatible.

Change-Id: I1c54d0d5ee8d5995a6a62b8102b40071a50decb7
Signed-off-by: Dean Birch <dean.birch@arm.com>

tfm_ci_pylib/tfm_build_manager.py

diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index 8eac0a4..4ce848a 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -194,7 +194,7 @@
                 # Merge the two dictionaries since the template may contain
                 # fixed and combinations seed parameters
                 cmd0 = build_cfg["config_template"] % \
-                    {**dict(i._asdict()), **build_cfg}
+                    dict(dict(i._asdict()), **build_cfg)
 
                 # Prepend configuration commoand as the first cmd
                 build_cfg["build_cmds"] = [cmd0] + build_cfg["build_cmds"]
@@ -466,7 +466,7 @@
                     static_config)
 
                 # Append the configuration to the existing ones
-                rejection_cfg = {**rejection_cfg, **rj_cfg}
+                rejection_cfg = dict(rejection_cfg, **rj_cfg)
 
             # Notfy the user for the rejected configuations
             for i in rejection_cfg.keys():