michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: Fix twisterlib for ruff - UP006

Browse source 
this fixes ruff linting error UP006,
where old typing types are still used
instead of newer, PEP585-compliant ones.

Signed-off-by: Lukasz Mrugala <lukaszx.mrugala@intel.com>
This commit is contained in:
Lukasz Mrugala 2024-11-27 12:12:40 +00:00 • committed by Carles Cufí
commit c273419864
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.ruff-excludes.toml
View file

@ -782,7 +782,6 @@
"./scripts/pylib/twister/twisterlib/environment.py" = [
"B006", # https://docs.astral.sh/ruff/rules/mutable-argument-default
"E501", # https://docs.astral.sh/ruff/rules/line-too-long
"UP006", # https://docs.astral.sh/ruff/rules/non-pep585-annotation
"UP021", # https://docs.astral.sh/ruff/rules/replace-universal-newlines
"UP031", # https://docs.astral.sh/ruff/rules/printf-string-formatting
]
@ -847,7 +846,6 @@
"SIM102", # https://docs.astral.sh/ruff/rules/collapsible-if
"SIM115", # https://docs.astral.sh/ruff/rules/open-file-with-context-handler
"UP004", # https://docs.astral.sh/ruff/rules/useless-object-inheritance
"UP006", # https://docs.astral.sh/ruff/rules/non-pep585-annotation
"UP015", # https://docs.astral.sh/ruff/rules/redundant-open-modes
"UP022", # https://docs.astral.sh/ruff/rules/replace-stdout-stderr
"UP031", # https://docs.astral.sh/ruff/rules/printf-string-formatting
@ -855,7 +853,6 @@
]
"./scripts/pylib/twister/twisterlib/size_calc.py" = [
"E501", # https://docs.astral.sh/ruff/rules/line-too-long
"UP006", # https://docs.astral.sh/ruff/rules/non-pep585-annotation
"UP015", # https://docs.astral.sh/ruff/rules/redundant-open-modes
"UP031", # https://docs.astral.sh/ruff/rules/printf-string-formatting
]
@ -884,7 +881,6 @@
"B006", # https://docs.astral.sh/ruff/rules/mutable-argument-default
"B904", # https://docs.astral.sh/ruff/rules/raise-without-from-inside-except
"E501", # https://docs.astral.sh/ruff/rules/line-too-long
"UP006", # https://docs.astral.sh/ruff/rules/non-pep585-annotation
"UP031", # https://docs.astral.sh/ruff/rules/printf-string-formatting
"UP032", # https://docs.astral.sh/ruff/rules/f-string
]

17
scripts/pylib/twister/twisterlib/size_calc.py
View file

@ -9,7 +9,6 @@ import os
import re
import subprocess
import sys
import typing
from twisterlib.error import TwisterRuntimeError
@ -99,7 +98,7 @@ class SizeCalculator:
USEFUL_LINES_AMOUNT = 4
def __init__(self, elf_filename: str,\
extra_sections: typing.List[str],\
extra_sections: list[str],\
buildlog_filepath: str = '',\
generate_warning: bool = True):
"""Constructor
@ -292,7 +291,7 @@ class SizeCalculator:
self._check_is_xip()
self._get_info_elf_sections()
def _get_buildlog_file_content(self) -> typing.List[str]:
def _get_buildlog_file_content(self) -> list[str]:
"""Get content of the build.log file.
@return Content of the build.log file (list[str])
@ -306,7 +305,7 @@ class SizeCalculator:
file_content = []
return file_content
def _find_offset_of_last_pattern_occurrence(self, file_content: typing.List[str]) -> int:
def _find_offset_of_last_pattern_occurrence(self, file_content: list[str]) -> int:
"""Find the offset from which the information about the memory footprint is read.
@param file_content (list[str]) Content of build.log.
@ -329,7 +328,7 @@ class SizeCalculator:
logger.warning(msg=f"Information about memory footprint for this test configuration is not found. Please check file {self.buildlog_filename}.")
return result
def _get_lines_with_footprint(self, start_offset: int, file_content: typing.List[str]) -> typing.List[str]:
def _get_lines_with_footprint(self, start_offset: int, file_content: list[str]) -> list[str]:
"""Get lines from the file with a memory footprint.
@param start_offset (int) Offset with the first line of the information about memory footprint.
@ -351,7 +350,7 @@ class SizeCalculator:
result = file_content[info_line_idx_start:info_line_idx_stop]
return result
def _clear_whitespaces_from_lines(self, text_lines: typing.List[str]) -> typing.List[str]:
def _clear_whitespaces_from_lines(self, text_lines: list[str]) -> list[str]:
"""Clear text lines from whitespaces.
@param text_lines (list[str]) Lines with useful information.
@ -359,7 +358,7 @@ class SizeCalculator:
"""
return [line.strip("\n").rstrip("%") for line in text_lines] if text_lines else []
def _divide_text_lines_into_columns(self, text_lines: typing.List[str]) -> typing.List[typing.List[str]]:
def _divide_text_lines_into_columns(self, text_lines: list[str]) -> list[list[str]]:
"""Divide lines of text into columns.
@param lines (list[list[str]]) Lines with information about memory footprint.
@ -376,7 +375,7 @@ class SizeCalculator:
return result
def _unify_prefixes_on_all_values(self, data_lines: typing.List[typing.List[str]]) -> typing.List[typing.List[str]]:
def _unify_prefixes_on_all_values(self, data_lines: list[list[str]]) -> list[list[str]]:
"""Convert all values in the table to unified order of magnitude.
@param data_lines (list[list[str]]) Lines with information about memory footprint.
@ -418,7 +417,7 @@ class SizeCalculator:
converted_value = str(numeric_value * unit_predictor)
return converted_value
def _create_data_table(self) -> typing.List[typing.List[str]]:
def _create_data_table(self) -> list[list[str]]:
"""Create table with information about memory footprint.
@return Table with information about memory usage (list[list[str]])