Move the python version to it's own section.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-03-09 07:46:49 +00:00 committed by Pedro Algarvio
parent bbb3ca4c8e
commit 604e37fa63
2 changed files with 6 additions and 1 deletions

View file

@ -689,7 +689,6 @@ def dependency_information(include_salt_cloud=False):
Report versions of library dependencies.
"""
libs = [
("Python", None, sys.version.rsplit("\n")[0].strip()),
("Jinja2", "jinja2", "__version__"),
("M2Crypto", "M2Crypto", "version"),
("msgpack", "msgpack", "version"),
@ -857,12 +856,16 @@ def versions_information(include_salt_cloud=False, include_extensions=True):
"""
Report the versions of dependent software.
"""
py_info = [
("Python", sys.version.rsplit("\n")[0].strip()),
]
salt_info = list(salt_information())
lib_info = list(dependency_information(include_salt_cloud))
sys_info = list(system_information())
info = {
"Salt Version": dict(salt_info),
"Python Version": dict(py_info),
"Dependency Versions": dict(lib_info),
"System Versions": dict(sys_info),
}
@ -894,6 +897,7 @@ def versions_report(include_salt_cloud=False, include_extensions=True):
info = []
for ver_type in (
"Salt Version",
"Python Version",
"Dependency Versions",
"Salt Extensions",
"System Versions",

View file

@ -17,6 +17,7 @@ def test_versions_report(salt_cli):
section[key] = section[key].strip()
ret = salt_cli.run("--versions-report")
assert ret.returncode == 0
assert ret.stdout
ret_lines = ret.stdout.split("\n")