Merge branch 'sb_py38' into 'master'

Fix qitest for python-3.8 See merge request qi/qibuild!134
aldebaran · Jan 29, 2021 · efea6fa · efea6fa
2 parents 6c1a1dc + 8cc36fc
commit efea6fa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
 
 

diff --git 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