💚 satisfy linter mostly

Author: jeroendecroos

pyproject.toml

@@ -9,7 +9,7 @@ description = "Typer, build great CLIs. Easy to code. Based on Python type hints
 authors = [
     {name = "Sebastián Ramírez", email = "tiangolo@gmail.com"},
 ]
-requires-python = ">=3.7"
+requires-python = ">=3.7"  # need 3.8 for typing-extensions >=4.8.0
 classifiers = [
     "Intended Audience :: Information Technology",
     "Intended Audience :: System Administrators",
@@ -34,7 +34,7 @@ classifiers = [
 ]
 dependencies = [
     "click >= 8.0.0",
-    "typing-extensions >= 3.7.4.3",
+    "typing-extensions >= 4.8.0",
 ]
 readme = "README.md"
 [project.urls]

typer/main.py

@@ -800,12 +800,29 @@ def lenient_issubclass(
     return isinstance(cls, type) and issubclass(cls, class_or_tuple)
 
 
+def _set_doc_help(param: ParamMeta, parameter_info: ParameterInfo) -> None:
+    if not param.other_annotations:
+        return
+    doc_annotations = [
+        annotation
+        for annotation in param.other_annotations
+        if isinstance(annotation, Doc)
+    ]
+    if len(doc_annotations) > 1:
+        raise MultipleDocAnnotationsError(param.name)
+    if len(doc_annotations) == 1:
+        doc_help = doc_annotations[0].documentation if doc_annotations else None
+        if not getattr(parameter_info, "help", None):
+            parameter_info.help = doc_help
+
+
 def get_click_param(
     param: ParamMeta,
 ) -> Tuple[Union[click.Argument, click.Option], Any]:
     # First, find out what will be:
     # * ParamInfo (ArgumentInfo or OptionInfo)
     # * default_value
+    # * help message
     # * required
     default_value = None
     required = False
@@ -821,18 +838,7 @@ def get_click_param(
     else:
         default_value = param.default
         parameter_info = OptionInfo()
-    if param.other_annotations:
-        doc_annotations = [
-            annotation
-            for annotation in param.other_annotations
-            if isinstance(annotation, Doc)
-        ]
-        if len(doc_annotations) > 1:
-            raise MultipleDocAnnotationsError(param.name)
-        if len(doc_annotations) == 1:
-            doc_help = doc_annotations[0].documentation if doc_annotations else None
-            if not getattr(parameter_info, "help", None):
-                parameter_info.help = doc_help
+    _set_doc_help(param, parameter_info)
     annotation: Any
     if param.annotation is not param.empty:
         annotation = param.annotation

typer/models.py

@@ -514,7 +514,7 @@ def __init__(
         name: str,
         default: Any = inspect.Parameter.empty,
         annotation: Any = inspect.Parameter.empty,
-        other_annotations: List[Any] = None,
+        other_annotations: Optional[List[Any]] = None,
     ) -> None:
         self.name = name
         self.default = default

typer/utils.py

@@ -107,7 +107,7 @@ def __str__(self) -> str:
 
 def _split_annotation_from_typer_annotations(
     base_annotation: Type[Any],
-) -> Tuple[Type[Any], List[ParameterInfo]]:
+) -> Tuple[Type[Any], List[ParameterInfo], List[Any]]:
     if get_origin(base_annotation) is not Annotated:
         return base_annotation, [], []
     base_annotation, *other_annotations = get_args(base_annotation)