espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-03 18:40:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/click_version_v5.4' into 'release/v5.4'

Browse Source 
Fixed click deprecation warnings (v5.4)

See merge request espressif/esp-idf!40894
This commit is contained in:
Roland Dobai
2025-09-01 11:59:10 +02:00
parent 08e7d2d276 2807696eb9
commit a13f3d3989
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/export_utils/shell_types.py
View File

@@ -9,6 +9,7 @@ import sys
import textwrap import textwrap
from datetime import datetime from datetime import datetime
from datetime import timedelta from datetime import timedelta
from importlib.metadata import version as importlib_version
from pathlib import Path from pathlib import Path
from subprocess import run from subprocess import run
from tempfile import gettempdir from tempfile import gettempdir
@@ -19,7 +20,6 @@ from typing import List
from typing import TextIO from typing import TextIO
from typing import Union from typing import Union
import click
from console_output import debug from console_output import debug
from console_output import status_message from console_output import status_message
from console_output import warn from console_output import warn
@@ -118,7 +118,7 @@ class UnixShell(Shell):
print(f'. {self.script_file_path}') print(f'. {self.script_file_path}')
def click_ver(self) -> int: def click_ver(self) -> int:
return int(click.__version__.split('.')[0]) return int(importlib_version('click').split('.')[0])
class BashShell(UnixShell): class BashShell(UnixShell):

2
tools/idf.py
View File

@@ -365,7 +365,7 @@ def init_cli(verbose_output: Optional[List]=None) -> Any:
return super(Option, self).get_help_record(ctx) return super(Option, self).get_help_record(ctx)
class CLI(click.MultiCommand): class CLI(click.Group):
"""Action list contains all actions with options available for CLI""" """Action list contains all actions with options available for CLI"""
def __init__(self, all_actions: Optional[Dict]=None, verbose_output: Optional[List]=None, help: Optional[str]=None) -> None: def __init__(self, all_actions: Optional[Dict]=None, verbose_output: Optional[List]=None, help: Optional[str]=None) -> None:
super(CLI, self).__init__( super(CLI, self).__init__(

2
tools/legacy_exports/export_legacy.fish
View File

@@ -101,7 +101,7 @@ end
__main __main
set click_version (python -c 'import click; print(click.__version__.split(".")[0])') set click_version (python -c 'from importlib.metadata import version as importlib_version; print(importlib_version('click').split(".")[0])')
if test $click_version -lt 8 if test $click_version -lt 8
eval (env _IDF.PY_COMPLETE=source_fish idf.py) eval (env _IDF.PY_COMPLETE=source_fish idf.py)
else else

2
tools/legacy_exports/export_legacy.sh
View File

@@ -209,7 +209,7 @@ __cleanup() {
__enable_autocomplete() { __enable_autocomplete() {
click_version="$(python -c 'import click; print(click.__version__.split(".")[0])')" click_version="$(python -c 'from importlib.metadata import version as importlib_version; print(importlib_version('click').split(".")[0])')"
if [ "${click_version}" -lt 8 ] if [ "${click_version}" -lt 8 ]
then then
SOURCE_ZSH=source_zsh SOURCE_ZSH=source_zsh