diff --git a/documentation/userguide/quickstart.rst b/documentation/userguide/quickstart.rst index 12a3fc6cdb2a3c7c4cc465b32da382fcf0da0238..c139f4b99d556363b1e7088fbf0fd650318d4017 100644 --- a/documentation/userguide/quickstart.rst +++ b/documentation/userguide/quickstart.rst @@ -18,8 +18,8 @@ Shrinkwrap is tested on **Ubuntu 20.04** although other Linux distributions are likely to JustWork (TM). macOS is also known to work when using the docker runtime as long as Docker Desktop has first been installed. -Shrinkwrap requires **at least Python 3.7** (for ordered dicts). Older versions -may work, but are not tested. +Shrinkwrap requires **at least Python 3.6.9**. Older versions may work, but are +not tested. .. code-block:: shell diff --git a/shrinkwrap/utils/process.py b/shrinkwrap/utils/process.py index 5b6777b73c3b4d9b6e7341682f0ab414f71f9c8b..d23841206b53e823e390ea258c354dafe2e417c6 100644 --- a/shrinkwrap/utils/process.py +++ b/shrinkwrap/utils/process.py @@ -132,7 +132,7 @@ class ProcessManager: stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, stderr=subprocess.PIPE, - text=True) + universal_newlines=True) proc._stdin = None proc._stdout = proc._popen.stdout diff --git a/shrinkwrap/utils/runtime.py b/shrinkwrap/utils/runtime.py index 0f80cc7509d58426ce9b467313092875592f8516..872a4a0c0bceda76056996887f067b310a5cdc7f 100644 --- a/shrinkwrap/utils/runtime.py +++ b/shrinkwrap/utils/runtime.py @@ -65,7 +65,10 @@ print(ip) """.replace('\n', '\\n').replace('\t', '\\t') cmd = ['python3', '-c', f'exec("{script}")'] - res = subprocess.run(self.mkcmd(cmd), text=True, capture_output=True) + res = subprocess.run(self.mkcmd(cmd), + universal_newlines=True, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) if res.returncode == 0: return res.stdout.strip() return '127.0.0.1' diff --git a/test/test.py b/test/test.py index 6a15efa0eec7709d348e4abc63be65eb66944815..8d8f677fe7d553651adc77eda192148239ed7e71 100755 --- a/test/test.py +++ b/test/test.py @@ -50,7 +50,7 @@ def print_result(r): def report(status, type, config, overlay): desc = f'{status.upper()}: {type}: {config},{overlay}' count = (1, 0) if status == 'pass' else (0, 1) - return *count, desc + return count[0], count[1], desc if r['type'] == 'build': configs = r['configs']