From 84c3cbf1d2d026304e05e87cba914f42e83e292a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 10:37:29 +0000
Subject: [PATCH 1/8] =?UTF-8?q?=E2=AC=86=20Bump=20ruff=20from=200.2.0=20to?=
 =?UTF-8?q?=200.6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.2.0 to 0.6.1.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/v0.2.0...0.6.1)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-tests.txt b/requirements-tests.txt
index ac6377c10d..0cacd0ecbe 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -6,7 +6,7 @@ coverage[toml] >=6.2,<8.0
 pytest-xdist >=1.32.0,<4.0.0
 pytest-sugar >=0.9.4,<1.1.0
 mypy ==1.4.1
-ruff ==0.2.0
+ruff ==0.6.1
 # Needed explicitly by typer-slim
 rich >=10.11.0
 shellingham >=1.3.0

From fbd90323775304b8eb63132486f0f4747edfe19c Mon Sep 17 00:00:00 2001
From: svlandeg <svlandeg@github.com>
Date: Wed, 21 Aug 2024 16:38:46 +0200
Subject: [PATCH 2/8] F-strings as in PR #891

---
 docs_src/using_click/tutorial001.py | 2 +-
 docs_src/using_click/tutorial003.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs_src/using_click/tutorial001.py b/docs_src/using_click/tutorial001.py
index 6fbf00649a..b3260c6494 100644
--- a/docs_src/using_click/tutorial001.py
+++ b/docs_src/using_click/tutorial001.py
@@ -7,7 +7,7 @@
 def hello(count, name):
     """Simple program that greets NAME for a total of COUNT times."""
     for x in range(count):
-        click.echo("Hello %s!" % name)
+        click.echo(f"Hello {name}!")
 
 
 if __name__ == "__main__":
diff --git a/docs_src/using_click/tutorial003.py b/docs_src/using_click/tutorial003.py
index a8f99e4623..5b3967c015 100644
--- a/docs_src/using_click/tutorial003.py
+++ b/docs_src/using_click/tutorial003.py
@@ -23,7 +23,7 @@ def callback():
 @click.option("--name", prompt="Your name", help="The person to greet.")
 def hello(name):
     """Simple program that greets NAME for a total of COUNT times."""
-    click.echo("Hello %s!" % name)
+    click.echo(f"Hello {name}!")
 
 
 typer_click_object = typer.main.get_command(app)

From 5a65c446677a4024609f24641043387615b0c280 Mon Sep 17 00:00:00 2001
From: svlandeg <svlandeg@github.com>
Date: Wed, 21 Aug 2024 16:39:15 +0200
Subject: [PATCH 3/8] isinstance() checks instead of ==

---
 typer/main.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/typer/main.py b/typer/main.py
index f7d634d8bc..298a58222a 100644
--- a/typer/main.py
+++ b/typer/main.py
@@ -705,9 +705,9 @@ def get_click_type(
     elif parameter_info.parser is not None:
         return click.types.FuncParamType(parameter_info.parser)
 
-    elif annotation == str:
+    elif isinstance(annotation, str):
         return click.STRING
-    elif annotation == int:
+    elif isinstance(annotation, int):
         if parameter_info.min is not None or parameter_info.max is not None:
             min_ = None
             max_ = None
@@ -718,7 +718,7 @@ def get_click_type(
             return click.IntRange(min=min_, max=max_, clamp=parameter_info.clamp)
         else:
             return click.INT
-    elif annotation == float:
+    elif isinstance(annotation, float):
         if parameter_info.min is not None or parameter_info.max is not None:
             return click.FloatRange(
                 min=parameter_info.min,
@@ -727,7 +727,7 @@ def get_click_type(
             )
         else:
             return click.FLOAT
-    elif annotation == bool:
+    elif isinstance(annotation, bool):
         return click.BOOL
     elif annotation == UUID:
         return click.UUID

From b55ccaad2bbc047ff959448215efb531b8343a50 Mon Sep 17 00:00:00 2001
From: svlandeg <svlandeg@github.com>
Date: Wed, 21 Aug 2024 16:39:44 +0200
Subject: [PATCH 4/8] reformat

---
 tests/test_ambiguous_params.py | 15 +++++----------
 typer/params.py                | 12 ++++--------
 typer/rich_utils.py            |  6 +++---
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/tests/test_ambiguous_params.py b/tests/test_ambiguous_params.py
index 4dbf09b569..0693c8e9aa 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)
@@ -83,8 +81,7 @@ def test_forbid_multiple_typer_params_in_annotated():
     @app.command()
     def cmd(
         my_param: Annotated[str, typer.Argument(), typer.Argument()],
-    ):
-        ...  # pragma: no cover
+    ): ...  # pragma: no cover
 
     with pytest.raises(MultipleTyperAnnotationsError) as excinfo:
         runner.invoke(app)
@@ -121,8 +118,7 @@ def make_string():
     @app.command()
     def cmd(
         my_param: Annotated[str, param(default_factory=make_string)] = "hello",
-    ):
-        ...  # pragma: no cover
+    ): ...  # pragma: no cover
 
     with pytest.raises(DefaultFactoryAndDefaultValueError) as excinfo:
         runner.invoke(app)
@@ -171,8 +167,7 @@ def make_string():
     @app.command()
     def cmd(
         my_param: str = param("hi", default_factory=make_string),
-    ):
-        ...  # pragma: no cover
+    ): ...  # pragma: no cover
 
     with pytest.raises(DefaultFactoryAndDefaultValueError) as excinfo:
         runner.invoke(app)
diff --git a/typer/params.py b/typer/params.py
index 710a4cf136..2fd025c90d 100644
--- a/typer/params.py
+++ b/typer/params.py
@@ -68,8 +68,7 @@ def Option(
     path_type: Union[None, Type[str], Type[bytes]] = None,
     # Rich settings
     rich_help_panel: Union[str, None] = None,
-) -> Any:
-    ...
+) -> Any: ...
 
 
 # Overload for Option created with custom type 'click_type'
@@ -132,8 +131,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(
@@ -305,8 +303,7 @@ def Argument(
     path_type: Union[None, Type[str], Type[bytes]] = None,
     # Rich settings
     rich_help_panel: Union[str, None] = None,
-) -> Any:
-    ...
+) -> Any: ...
 
 
 # Overload for Argument created with custom type 'click_type'
@@ -361,8 +358,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 cf0538e914..900f4b4e87 100644
--- a/typer/rich_utils.py
+++ b/typer/rich_utils.py
@@ -68,9 +68,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

From 52722d0ca448d234c397facad2a57ea0fb923a0c Mon Sep 17 00:00:00 2001
From: svlandeg <svlandeg@github.com>
Date: Wed, 21 Aug 2024 16:47:07 +0200
Subject: [PATCH 5/8] is instead of isinstance()

---
 typer/main.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/typer/main.py b/typer/main.py
index 298a58222a..9b71e819b7 100644
--- a/typer/main.py
+++ b/typer/main.py
@@ -705,9 +705,9 @@ def get_click_type(
     elif parameter_info.parser is not None:
         return click.types.FuncParamType(parameter_info.parser)
 
-    elif isinstance(annotation, str):
+    elif annotation is str:
         return click.STRING
-    elif isinstance(annotation, int):
+    elif annotation is int:
         if parameter_info.min is not None or parameter_info.max is not None:
             min_ = None
             max_ = None
@@ -718,7 +718,7 @@ def get_click_type(
             return click.IntRange(min=min_, max=max_, clamp=parameter_info.clamp)
         else:
             return click.INT
-    elif isinstance(annotation, float):
+    elif annotation is float:
         if parameter_info.min is not None or parameter_info.max is not None:
             return click.FloatRange(
                 min=parameter_info.min,
@@ -727,7 +727,7 @@ def get_click_type(
             )
         else:
             return click.FLOAT
-    elif isinstance(annotation, bool):
+    elif annotation is bool:
         return click.BOOL
     elif annotation == UUID:
         return click.UUID

From b87a0c2a6d337fdc0ecef2c4468fede70fb6df14 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 09:49:39 +0000
Subject: [PATCH 6/8] =?UTF-8?q?=F0=9F=8E=A8=20[pre-commit.ci]=20Auto=20for?=
 =?UTF-8?q?mat=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 | 15 ++++++++++-----
 typer/params.py                | 12 ++++++++----
 typer/rich_utils.py            |  6 +++---
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/tests/test_ambiguous_params.py b/tests/test_ambiguous_params.py
index 0693c8e9aa..4dbf09b569 100644
--- a/tests/test_ambiguous_params.py
+++ b/tests/test_ambiguous_params.py
@@ -29,7 +29,8 @@ 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)
@@ -63,7 +64,8 @@ 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,7 +83,8 @@ def test_forbid_multiple_typer_params_in_annotated():
     @app.command()
     def cmd(
         my_param: Annotated[str, typer.Argument(), typer.Argument()],
-    ): ...  # pragma: no cover
+    ):
+        ...  # pragma: no cover
 
     with pytest.raises(MultipleTyperAnnotationsError) as excinfo:
         runner.invoke(app)
@@ -118,7 +121,8 @@ def make_string():
     @app.command()
     def cmd(
         my_param: Annotated[str, param(default_factory=make_string)] = "hello",
-    ): ...  # pragma: no cover
+    ):
+        ...  # pragma: no cover
 
     with pytest.raises(DefaultFactoryAndDefaultValueError) as excinfo:
         runner.invoke(app)
@@ -167,7 +171,8 @@ def make_string():
     @app.command()
     def cmd(
         my_param: str = param("hi", default_factory=make_string),
-    ): ...  # pragma: no cover
+    ):
+        ...  # pragma: no cover
 
     with pytest.raises(DefaultFactoryAndDefaultValueError) as excinfo:
         runner.invoke(app)
diff --git a/typer/params.py b/typer/params.py
index 2fd025c90d..710a4cf136 100644
--- a/typer/params.py
+++ b/typer/params.py
@@ -68,7 +68,8 @@ def Option(
     path_type: Union[None, Type[str], Type[bytes]] = None,
     # Rich settings
     rich_help_panel: Union[str, None] = None,
-) -> Any: ...
+) -> Any:
+    ...
 
 
 # Overload for Option created with custom type 'click_type'
@@ -131,7 +132,8 @@ def Option(
     path_type: Union[None, Type[str], Type[bytes]] = None,
     # Rich settings
     rich_help_panel: Union[str, None] = None,
-) -> Any: ...
+) -> Any:
+    ...
 
 
 def Option(
@@ -303,7 +305,8 @@ def Argument(
     path_type: Union[None, Type[str], Type[bytes]] = None,
     # Rich settings
     rich_help_panel: Union[str, None] = None,
-) -> Any: ...
+) -> Any:
+    ...
 
 
 # Overload for Argument created with custom type 'click_type'
@@ -358,7 +361,8 @@ 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 900f4b4e87..cf0538e914 100644
--- a/typer/rich_utils.py
+++ b/typer/rich_utils.py
@@ -68,9 +68,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

From ec6296ae7a839f17c9fbb6c4b95f3425ca6ebcef Mon Sep 17 00:00:00 2001
From: svlandeg <svlandeg@github.com>
Date: Tue, 27 Aug 2024 10:59:53 +0200
Subject: [PATCH 7/8] update precommit ruff version as well

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3289dd0950..4ea5b873a6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,7 +14,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.0
+    rev: v0.6.1
     hooks:
     -   id: ruff
         args:

From aa10655030e3f9cba071086aaf3778c24bb6ea46 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 27 Aug 2024 09:00:10 +0000
Subject: [PATCH 8/8] =?UTF-8?q?=F0=9F=8E=A8=20[pre-commit.ci]=20Auto=20for?=
 =?UTF-8?q?mat=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 | 15 +++++----------
 typer/params.py                | 12 ++++--------
 typer/rich_utils.py            |  6 +++---
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/tests/test_ambiguous_params.py b/tests/test_ambiguous_params.py
index 4dbf09b569..0693c8e9aa 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)
@@ -83,8 +81,7 @@ def test_forbid_multiple_typer_params_in_annotated():
     @app.command()
     def cmd(
         my_param: Annotated[str, typer.Argument(), typer.Argument()],
-    ):
-        ...  # pragma: no cover
+    ): ...  # pragma: no cover
 
     with pytest.raises(MultipleTyperAnnotationsError) as excinfo:
         runner.invoke(app)
@@ -121,8 +118,7 @@ def make_string():
     @app.command()
     def cmd(
         my_param: Annotated[str, param(default_factory=make_string)] = "hello",
-    ):
-        ...  # pragma: no cover
+    ): ...  # pragma: no cover
 
     with pytest.raises(DefaultFactoryAndDefaultValueError) as excinfo:
         runner.invoke(app)
@@ -171,8 +167,7 @@ def make_string():
     @app.command()
     def cmd(
         my_param: str = param("hi", default_factory=make_string),
-    ):
-        ...  # pragma: no cover
+    ): ...  # pragma: no cover
 
     with pytest.raises(DefaultFactoryAndDefaultValueError) as excinfo:
         runner.invoke(app)
diff --git a/typer/params.py b/typer/params.py
index 710a4cf136..2fd025c90d 100644
--- a/typer/params.py
+++ b/typer/params.py
@@ -68,8 +68,7 @@ def Option(
     path_type: Union[None, Type[str], Type[bytes]] = None,
     # Rich settings
     rich_help_panel: Union[str, None] = None,
-) -> Any:
-    ...
+) -> Any: ...
 
 
 # Overload for Option created with custom type 'click_type'
@@ -132,8 +131,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(
@@ -305,8 +303,7 @@ def Argument(
     path_type: Union[None, Type[str], Type[bytes]] = None,
     # Rich settings
     rich_help_panel: Union[str, None] = None,
-) -> Any:
-    ...
+) -> Any: ...
 
 
 # Overload for Argument created with custom type 'click_type'
@@ -361,8 +358,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 cf0538e914..900f4b4e87 100644
--- a/typer/rich_utils.py
+++ b/typer/rich_utils.py
@@ -68,9 +68,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