From 8b446f09208cc883b4e3a49abcc1b7d219dd5cc4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 22:36:29 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20[pre-commit.ci]=20Auto=20format?= =?UTF-8?q?=20from=20pre-commit.com=20hooks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_ambiguous_params.py | 21 +++++++++++---------- typer/_typing.py | 8 +++++--- typer/params.py | 12 ++++-------- typer/rich_utils.py | 22 +++++++++++++--------- 4 files changed, 33 insertions(+), 30 deletions(-) diff --git a/tests/test_ambiguous_params.py b/tests/test_ambiguous_params.py index 7938ac57c8..762947dd5e 100644 --- a/tests/test_ambiguous_params.py +++ b/tests/test_ambiguous_params.py @@ -29,8 +29,7 @@ def test_forbid_default_value_in_annotated_argument(): # This test case only works with `typer.Argument`. `typer.Option` uses positionals # for param_decls too. @app.command() - def cmd(my_param: Annotated[str, typer.Argument("foo")]): - ... # pragma: no cover + def cmd(my_param: Annotated[str, typer.Argument("foo")]): ... # pragma: no cover with pytest.raises(AnnotatedParamWithDefaultValueError) as excinfo: runner.invoke(app) @@ -64,8 +63,7 @@ def test_forbid_annotated_param_and_default_param(param, param_info_type): app = typer.Typer() @app.command() - def cmd(my_param: Annotated[str, param()] = param("foo")): - ... # pragma: no cover + def cmd(my_param: Annotated[str, param()] = param("foo")): ... # pragma: no cover with pytest.raises(MixedAnnotatedAndDefaultStyleError) as excinfo: runner.invoke(app) @@ -81,8 +79,9 @@ def test_forbid_multiple_typer_params_in_annotated(): app = typer.Typer() @app.command() - def cmd(my_param: Annotated[str, typer.Argument(), typer.Argument()]): - ... # pragma: no cover + def cmd( + my_param: Annotated[str, typer.Argument(), typer.Argument()] + ): ... # pragma: no cover with pytest.raises(MultipleTyperAnnotationsError) as excinfo: runner.invoke(app) @@ -117,8 +116,9 @@ def make_string(): app = typer.Typer() @app.command() - def cmd(my_param: Annotated[str, param(default_factory=make_string)] = "hello"): - ... # pragma: no cover + def cmd( + my_param: Annotated[str, param(default_factory=make_string)] = "hello" + ): ... # pragma: no cover with pytest.raises(DefaultFactoryAndDefaultValueError) as excinfo: runner.invoke(app) @@ -165,8 +165,9 @@ def make_string(): app = typer.Typer() @app.command() - def cmd(my_param: str = param("hi", default_factory=make_string)): - ... # pragma: no cover + def cmd( + my_param: str = param("hi", default_factory=make_string) + ): ... # pragma: no cover with pytest.raises(DefaultFactoryAndDefaultValueError) as excinfo: runner.invoke(app) diff --git a/typer/_typing.py b/typer/_typing.py index bfa8114fcb..bfdc958a53 100644 --- a/typer/_typing.py +++ b/typer/_typing.py @@ -237,9 +237,11 @@ def convert_generics(tp: Type[Any]) -> Type[Any]: # recursively replace `str` instances inside of `GenericAlias` with `ForwardRef(arg)` converted = tuple( - ForwardRef(arg) - if isinstance(arg, str) and isinstance(tp, TypingGenericAlias) - else convert_generics(arg) + ( + ForwardRef(arg) + if isinstance(arg, str) and isinstance(tp, TypingGenericAlias) + else convert_generics(arg) + ) for arg in args ) diff --git a/typer/params.py b/typer/params.py index a143f3f749..3d9184b83a 100644 --- a/typer/params.py +++ b/typer/params.py @@ -67,8 +67,7 @@ def Option( path_type: Union[None, Type[str], Type[bytes]] = None, # Rich settings rich_help_panel: Union[str, None] = None, -) -> Any: - ... +) -> Any: ... @overload @@ -130,8 +129,7 @@ def Option( path_type: Union[None, Type[str], Type[bytes]] = None, # Rich settings rich_help_panel: Union[str, None] = None, -) -> Any: - ... +) -> Any: ... def Option( @@ -301,8 +299,7 @@ def Argument( path_type: Union[None, Type[str], Type[bytes]] = None, # Rich settings rich_help_panel: Union[str, None] = None, -) -> Any: - ... +) -> Any: ... @overload @@ -355,8 +352,7 @@ def Argument( path_type: Union[None, Type[str], Type[bytes]] = None, # Rich settings rich_help_panel: Union[str, None] = None, -) -> Any: - ... +) -> Any: ... def Argument( diff --git a/typer/rich_utils.py b/typer/rich_utils.py index fdb61b6719..8135853e18 100644 --- a/typer/rich_utils.py +++ b/typer/rich_utils.py @@ -67,9 +67,9 @@ STYLE_ABORTED = "red" _TERMINAL_WIDTH = getenv("TERMINAL_WIDTH") MAX_WIDTH = int(_TERMINAL_WIDTH) if _TERMINAL_WIDTH else None -COLOR_SYSTEM: Optional[ - Literal["auto", "standard", "256", "truecolor", "windows"] -] = "auto" # Set to None to disable colors +COLOR_SYSTEM: Optional[Literal["auto", "standard", "256", "truecolor", "windows"]] = ( + "auto" # Set to None to disable colors +) _TYPER_FORCE_DISABLE_TERMINAL = getenv("_TYPER_FORCE_DISABLE_TERMINAL") FORCE_TERMINAL = ( True @@ -205,9 +205,11 @@ def _get_help_text( if markup_mode != MARKUP_MODE_RICH: # Remove single linebreaks remaining_paragraphs = [ - x.replace("\n", " ").strip() - if not x.startswith("\b") - else "{}\n".format(x.strip("\b\n")) + ( + x.replace("\n", " ").strip() + if not x.startswith("\b") + else "{}\n".format(x.strip("\b\n")) + ) for x in remaining_paragraphs ] # Join back together @@ -265,9 +267,11 @@ def _get_parameter_help( # Remove single linebreaks if markup_mode != MARKUP_MODE_MARKDOWN: paragraphs = [ - x.replace("\n", " ").strip() - if not x.startswith("\b") - else "{}\n".format(x.strip("\b\n")) + ( + x.replace("\n", " ").strip() + if not x.startswith("\b") + else "{}\n".format(x.strip("\b\n")) + ) for x in paragraphs ] items.append(