ci/lava: Fix imports formatting

Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25912>
This commit is contained in:
Guilherme Gallo
2023-10-25 12:06:53 -03:00
committed by Marge Bot
parent f7f2d26e3b
commit af9273eb4f
2 changed files with 11 additions and 12 deletions
+4 -3
View File
@@ -22,15 +22,16 @@ from os import environ, getenv, path
from typing import Any, Optional
import fire
from lavacli.utils import flow_yaml as lava_yaml
from lava.exceptions import (
MesaCIException,
MesaCIParseException,
MesaCIRetryError,
MesaCITimeoutError,
)
from lava.utils import CONSOLE_LOG
from lava.utils import DEFAULT_GITLAB_SECTION_TIMEOUTS as GL_SECTION_TIMEOUTS
from lava.utils import (
CONSOLE_LOG,
GitlabSection,
LAVAJob,
LogFollower,
@@ -42,7 +43,7 @@ from lava.utils import (
print_log,
setup_lava_proxy,
)
from lavacli.utils import flow_yaml as lava_yaml
from lava.utils import DEFAULT_GITLAB_SECTION_TIMEOUTS as GL_SECTION_TIMEOUTS
# Initialize structural logging with a defaultdict, it can be changed for more
# sophisticated dict-like data abstractions.
+7 -9
View File
@@ -1,11 +1,11 @@
import re
from io import StringIO
from os import getenv
from typing import TYPE_CHECKING, Any
import re
from lava.utils.lava_farm import LavaFarm, get_lava_farm
from ruamel.yaml.scalarstring import LiteralScalarString
from ruamel.yaml import YAML
from os import getenv
from ruamel.yaml.scalarstring import LiteralScalarString
if TYPE_CHECKING:
from lava.lava_job_submitter import LAVAJobSubmitter
@@ -44,12 +44,10 @@ def generate_lava_yaml_payload(job_submitter: "LAVAJobSubmitter") -> dict[str, A
the job output, escaping from dumping data to the UART, which proves to be
error prone in some devices.
"""
from lava.utils.ssh_job_definition import (
generate_lava_yaml_payload as ssh_lava_yaml,
)
from lava.utils.uart_job_definition import (
generate_lava_yaml_payload as uart_lava_yaml,
)
from lava.utils.ssh_job_definition import \
generate_lava_yaml_payload as ssh_lava_yaml
from lava.utils.uart_job_definition import \
generate_lava_yaml_payload as uart_lava_yaml
if has_ssh_support(job_submitter):
return ssh_lava_yaml(job_submitter)