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

Fixed click deprecation warnings (v5.4)

See merge request espressif/esp-idf!40894

tools/export_utils/shell_types.py

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

tools/idf.py

@@ -365,7 +365,7 @@ def init_cli(verbose_output: Optional[List]=None) -> Any:
 
             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"""
         def __init__(self, all_actions: Optional[Dict]=None, verbose_output: Optional[List]=None, help: Optional[str]=None) -> None:
             super(CLI, self).__init__(

tools/legacy_exports/export_legacy.fish

@@ -101,7 +101,7 @@ end
 
 __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
     eval (env _IDF.PY_COMPLETE=source_fish idf.py)
 else

tools/legacy_exports/export_legacy.sh

@@ -209,7 +209,7 @@ __cleanup() {
 
 
 __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 ]
     then
         SOURCE_ZSH=source_zsh