blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-11 10:09:08 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'ci/fix_os_pathlike' into 'master'

Browse Source 
ci: fix subtyping in type annotations under python3.7

See merge request espressif/esp-idf!19255
This commit is contained in:
Fu Hanxi 2022-07-27 12:01:10 +08:00
commit cdbc581f96
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/ci/check_deprecated_kconfigs.py
View File

@ -24,7 +24,7 @@ IGNORE_DIRS: Tuple = (
)
def _parse_path(path: os.PathLike[str], sep: str=None) -> Set:
def _parse_path(path: 'os.PathLike[str]', sep: str=None) -> Set:
ret = set()
with open(path, 'r', encoding='utf-8') as f:
for line in f:
@ -34,7 +34,7 @@ def _parse_path(path: os.PathLike[str], sep: str=None) -> Set:
return ret
def _valid_directory(path: os.PathLike[str]) -> os.PathLike[str]:
def _valid_directory(path: 'os.PathLike[str]') -> 'os.PathLike[str]':
if not os.path.isdir(path):
raise argparse.ArgumentTypeError('{} is not a valid directory!'.format(path))
return path

6
tools/ci/check_public_headers.py
View File

@ -56,12 +56,12 @@ def exec_cmd_to_temp_file(what: List, suffix: str='') -> Tuple[int, str, str, st
return rc, out, err, out_file.name, cmd
def exec_cmd(what: List, out_file: Union[tempfile._TemporaryFileWrapper[bytes], int]=subprocess.PIPE) -> Tuple[int, str, str, str]:
def exec_cmd(what: List, out_file: Union['tempfile._TemporaryFileWrapper[bytes]', int]=subprocess.PIPE) -> Tuple[int, str, str, str]:
p = subprocess.Popen(what, stdin=subprocess.PIPE, stdout=out_file, stderr=subprocess.PIPE)
output_b, err_b = p.communicate()
rc = p.returncode
output: str = output_b.decode('utf-8') if output is not None else ''
err: str = err_b.decode('utf-8') if err is not None else ''
output: str = output_b.decode('utf-8') if output_b is not None else ''
err: str = err_b.decode('utf-8') if err_b is not None else ''
return rc, output, err, ' '.join(what)

2
tools/ci/check_rules_yml.py
View File

@ -76,7 +76,7 @@ class YMLConfig:
YML_CONFIG = YMLConfig(ROOT_YML_FP)
def validate_needed_rules(rules_yml: os.PathLike[str]) -> int:
def validate_needed_rules(rules_yml: 'os.PathLike[str]') -> int:
res = 0
needed_rules = deepcopy(YML_CONFIG.all_extends)
with open(rules_yml) as fr:

2
tools/idf.py
View File

@ -472,7 +472,7 @@ def init_cli(verbose_output: List=None) -> Any:
with open(os.path.join(args.build_dir, 'flasher_args.json')) as file:
flasher_args: Dict[str, Any] = json.load(file)
def flasher_path(f: Union[str, os.PathLike[str]]) -> str:
def flasher_path(f: Union[str, 'os.PathLike[str]']) -> str:
if type(args.build_dir) is bytes:
args.build_dir = args.build_dir.decode()
return _safe_relpath(os.path.join(args.build_dir, f))