BugFixes needed to update latex and python

This commit is contained in:
Dirk Alders 2020-06-28 21:17:16 +02:00
parent 279a524eb6
commit d243a1667e
2 changed files with 9 additions and 5 deletions

10
run.py
View File

@ -7,9 +7,13 @@ import reqif
import json import json
import os import os
import platform
import getpass
import sys import sys
import platform
try:
from platform import dist as dist
except ImportError:
from distro import linux_distribution as dist
import getpass
import subprocess import subprocess
import imp import imp
import xml.dom.minidom import xml.dom.minidom
@ -224,7 +228,7 @@ def unittest_init(unittest_folder):
system_info['Architecture'] = platform.architecture()[0] system_info['Architecture'] = platform.architecture()[0]
system_info['Machine'] = platform.machine() system_info['Machine'] = platform.machine()
system_info['Hostname'] = platform.node() system_info['Hostname'] = platform.node()
system_info['Distribution'] = ' '.join(platform.dist()) system_info['Distribution'] = ' '.join(dist())
system_info['System'] = platform.system() system_info['System'] = platform.system()
system_info['Kernel'] = platform.release() + ' (%s)' % platform.version() system_info['Kernel'] = platform.release() + ' (%s)' % platform.version()
system_info['Username'] = getpass.getuser() system_info['Username'] = getpass.getuser()

View File

@ -12,9 +12,9 @@
{%- for fragment in py_file.fragments %} {%- for fragment in py_file.fragments %}
\lstset{backgroundcolor=\color{bg-{{fragment.coverage_state}}}}\vspace*{-2.7ex} \lstset{backgroundcolor=\color{bg-{{fragment.coverage_state}}}}\vspace*{-2.7ex}
{%- if fragment.end is not none %} {%- if fragment.end is not none %}
\lstinputlisting[language=Python, linerange={{fragment.start}}-{{fragment.end}}, firstnumber={{fragment.start}}]{ {{py_file.filepath}} } \lstinputlisting[language=Python, linerange={{fragment.start}}-{{fragment.end}}, firstnumber={{fragment.start}}]{{ "{" ~ py_file.filepath ~ "}" }}
{%- else %} {%- else %}
\lstinputlisting[language=Python, firstline={{fragment.start}}, firstnumber={{fragment.start}}]{ {{py_file.filepath}} } \lstinputlisting[language=Python, firstline={{fragment.start}}, firstnumber={{fragment.start}}]{{ "{" ~ py_file.filepath ~ "}" }}
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
{% endfor %} {% endfor %}