- Add patch support-click-8.2.patch:

* Support both click 8.1 and 8.2.
- Switch to autosetup macro.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-typer?expand=0&rev=45

python-typer.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May 16 05:00:12 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Add patch support-click-8.2.patch:
+  * Support both click 8.1 and 8.2.
+- Switch to autosetup macro.
+
 -------------------------------------------------------------------
 Tue Apr 29 17:58:31 UTC 2025 - Matthias Bach <marix@marix.org> - 0.15.3
 

python-typer.spec

@@ -24,12 +24,17 @@ Version:        0.15.3
 Release:        0
 Summary:        Typer, build great CLIs. Easy to code. Based on Python type hints
 License:        MIT
-Group:          Development/Languages/Python
 URL:            https://github.com/tiangolo/typer
 Source:         https://files.pythonhosted.org/packages/source/t/typer/typer-%{version}.tar.gz
 Source2:        %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM gh#fastapi/typer#1222
+Patch0:         support-click-8.2.patch
+BuildRequires:  %{python_module coverage}
 BuildRequires:  %{python_module pdm-backend}
 BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module rich}
+BuildRequires:  %{python_module shellingham}
 BuildRequires:  %{python_module typer-slim}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -59,8 +64,7 @@ which allows users to run scripts not using typer with the same command line com
 as those that do.
 
 %prep
-%setup -q -n typer-%{version}
-%autopatch -p1
+%autosetup -p1 -n typer-%{version}
 
 %build
 %pyproject_wheel
@@ -76,7 +80,10 @@ as those that do.
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-# There are no tests in the python package as it only pulls dependencies
+# Broken with click 8.2.0:
+# - test_enum/test_tutorial003
+# - test_script_completion_run and test_completion_show_invalid_shell
+%pytest -k 'not ((test_enum and test_tutorial003) or test_script_completion_run or test_completion_show_invalid_shell)'
 
 %post
 %python_install_alternative typer
@@ -88,6 +95,6 @@ as those that do.
 %doc README.md
 %license LICENSE
 %python_alternative %{_bindir}/typer
-%{python_sitelib}/typer-%{version}*-info
+%{python_sitelib}/typer-%{version}.dist-info
 
 %changelog

support-click-8.2.patch

@@ -0,0 +1,926 @@
+From 6cd8b4d08ffc70cc0f62dfa011c71f68f1f0d5fa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
+Date: Tue, 13 May 2025 19:11:32 +0200
+Subject: [PATCH 1/6] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Update=20internals=20f?=
+ =?UTF-8?q?or=20compatibility=20with=20Click=208.2?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ typer/core.py       | 30 ++++++++++++++++++++++++++----
+ typer/rich_utils.py |  8 +++++++-
+ 2 files changed, 33 insertions(+), 5 deletions(-)
+
+Index: typer_slim-0.15.3/typer/core.py
+===================================================================
+--- typer_slim-0.15.3.orig/typer/core.py
++++ typer_slim-0.15.3/typer/core.py
+@@ -329,7 +329,7 @@ class TyperArgument(click.core.Argument)
+         # to support Arguments
+         if self.hidden:
+             return None
+-        name = self.make_metavar()
++        name = self.make_metavar(ctx=ctx)
+         help = self.help or ""
+         extra = []
+         if self.show_envvar:
+@@ -375,7 +375,8 @@ class TyperArgument(click.core.Argument)
+             help = f"{help}  {extra_str}" if help else f"{extra_str}"
+         return name, help
+ 
+-    def make_metavar(self) -> str:
++    # TODO: When deprecating Click < 8.2, make context required
++    def make_metavar(self, ctx: Union[click.Context, None] = None) -> str:
+         # Modified version of click.core.Argument.make_metavar()
+         # to include Argument name
+         if self.metavar is not None:
+@@ -383,7 +384,16 @@ class TyperArgument(click.core.Argument)
+         var = (self.name or "").upper()
+         if not self.required:
+             var = f"[{var}]"
+-        type_var = self.type.get_metavar(self)
++        # TODO: When Click < 8.2, remove this
++        signature = inspect.signature(self.type.get_metavar)
++        if "ctx" in signature.parameters:
++            # Click >= 8.2
++            type_var = self.type.get_metavar(self, ctx=ctx)  # type: ignore[arg-type]
++        else:
++            # Click < 8.2
++            type_var = self.type.get_metavar(self)  # type: ignore[call-arg]
++        # TODO: /When Click < 8.2, remove this, uncomment the line below
++        # type_var = self.type.get_metavar(self, ctx=use_ctx)
+         if type_var:
+             var += f":{type_var}"
+         if self.nargs != 1:
+@@ -480,6 +490,16 @@ class TyperOption(click.core.Option):
+     ) -> Optional[Union[Any, Callable[[], Any]]]:
+         return _extract_default_help_str(self, ctx=ctx)
+ 
++    # TODO: Remove when deprecating Click < 8.2
++    def make_metavar(self, ctx: Union[click.Context, None] = None) -> str:
++        super_make_metavar = super().make_metavar
++        signature = inspect.signature(super_make_metavar)
++        if "ctx" in signature.parameters:
++            # Click >= 8.2
++            return super_make_metavar(ctx=ctx)  # type: ignore[arg-type]
++        # Click < 8.2
++        return super().make_metavar()  # type: ignore[call-arg]
++
+     def get_help_record(self, ctx: click.Context) -> Optional[Tuple[str, str]]:
+         # Duplicate all of Click's logic only to modify a single line, to allow boolean
+         # flags with only names for False values as it's currently supported by Typer
+@@ -498,7 +518,7 @@ class TyperOption(click.core.Option):
+                 any_prefix_is_slash = True
+ 
+             if not self.is_flag and not self.count:
+-                rv += f" {self.make_metavar()}"
++                rv += f" {self.make_metavar(ctx=ctx)}"
+ 
+             return rv
+ 
+Index: typer_slim-0.15.3/typer/rich_utils.py
+===================================================================
+--- typer_slim-0.15.3.orig/typer/rich_utils.py
++++ typer_slim-0.15.3/typer/rich_utils.py
+@@ -370,7 +370,13 @@ def _print_options_panel(
+ 
+         # Column for a metavar, if we have one
+         metavar = Text(style=STYLE_METAVAR, overflow="fold")
+-        metavar_str = param.make_metavar()
++        # TODO: when deprecating Click < 8.2, make ctx required
++        signature = inspect.signature(param.make_metavar)
++        if "ctx" in signature.parameters:
++            metavar_str = param.make_metavar(ctx=ctx)
++        else:
++            # Click < 8.2
++            metavar_str = param.make_metavar()  # type: ignore[call-arg]
+ 
+         # Do it ourselves if this is a positional argument
+         if (
+Index: typer_slim-0.15.3/typer/_completion_classes.py
+===================================================================
+--- typer_slim-0.15.3.orig/typer/_completion_classes.py
++++ typer_slim-0.15.3/typer/_completion_classes.py
+@@ -17,6 +17,14 @@ from ._completion_shared import (
+ )
+ 
+ try:
++    from click.shell_completion import split_arg_string as click_split_arg_string
++except ImportError:  # pragma: no cover
++    # TODO: when removing support for Click < 8.2, remove this import
++    from click.parser import (  # type: ignore[no-redef]
++        split_arg_string as click_split_arg_string,
++    )
++
++try:
+     import shellingham
+ except ImportError:  # pragma: no cover
+     shellingham = None
+@@ -43,7 +51,7 @@ class BashComplete(click.shell_completio
+         }
+ 
+     def get_completion_args(self) -> Tuple[List[str], str]:
+-        cwords = click.parser.split_arg_string(os.environ["COMP_WORDS"])
++        cwords = click_split_arg_string(os.environ["COMP_WORDS"])
+         cword = int(os.environ["COMP_CWORD"])
+         args = cwords[1:cword]
+ 
+@@ -80,7 +88,7 @@ class ZshComplete(click.shell_completion
+ 
+     def get_completion_args(self) -> Tuple[List[str], str]:
+         completion_args = os.getenv("_TYPER_COMPLETE_ARGS", "")
+-        cwords = click.parser.split_arg_string(completion_args)
++        cwords = click_split_arg_string(completion_args)
+         args = cwords[1:]
+         if args and not completion_args.endswith(" "):
+             incomplete = args[-1]
+@@ -131,7 +139,7 @@ class FishComplete(click.shell_completio
+ 
+     def get_completion_args(self) -> Tuple[List[str], str]:
+         completion_args = os.getenv("_TYPER_COMPLETE_ARGS", "")
+-        cwords = click.parser.split_arg_string(completion_args)
++        cwords = click_split_arg_string(completion_args)
+         args = cwords[1:]
+         if args and not completion_args.endswith(" "):
+             incomplete = args[-1]
+@@ -185,7 +193,7 @@ class PowerShellComplete(click.shell_com
+     def get_completion_args(self) -> Tuple[List[str], str]:
+         completion_args = os.getenv("_TYPER_COMPLETE_ARGS", "")
+         incomplete = os.getenv("_TYPER_COMPLETE_WORD_TO_COMPLETE", "")
+-        cwords = click.parser.split_arg_string(completion_args)
++        cwords = click_split_arg_string(completion_args)
+         args = cwords[1:-1] if incomplete else cwords[1:]
+         return args, incomplete
+ 
+Index: typer_slim-0.15.3/tests/test_others.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_others.py
++++ typer_slim-0.15.3/tests/test_others.py
+@@ -243,7 +243,7 @@ def test_forward_references():
+ 
+     result = runner.invoke(app, ["Hello", "2", "invalid"])
+ 
+-    assert "Invalid value for 'ARG3': 'invalid' is not a valid integer" in result.stdout
++    assert "Invalid value for 'ARG3': 'invalid' is not a valid integer" in result.output
+     result = runner.invoke(app, ["Hello", "2", "3", "--arg4", "--arg5"])
+     assert (
+         "arg1: <class 'str'> Hello\narg2: <class 'int'> 2\narg3: <class 'int'> 3\narg4: <class 'bool'> True\narg5: <class 'bool'> True\n"
+Index: typer_slim-0.15.3/tests/test_tutorial/test_arguments/test_optional/test_tutorial001.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_arguments/test_optional/test_tutorial001.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_arguments/test_optional/test_tutorial001.py
+@@ -31,7 +31,7 @@ def test_call_no_arg_no_rich():
+     typer.core.rich = None
+     result = runner.invoke(app)
+     assert result.exit_code != 0
+-    assert "Error: Missing argument 'NAME'" in result.stdout
++    assert "Error: Missing argument 'NAME'" in result.output
+     typer.core.rich = rich
+ 
+ 
+Index: typer_slim-0.15.3/tests/test_tutorial/test_arguments/test_optional/test_tutorial001_an.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_arguments/test_optional/test_tutorial001_an.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_arguments/test_optional/test_tutorial001_an.py
+@@ -31,7 +31,7 @@ def test_call_no_arg_no_rich():
+     typer.core.rich = None
+     result = runner.invoke(app)
+     assert result.exit_code != 0
+-    assert "Error: Missing argument 'NAME'" in result.stdout
++    assert "Error: Missing argument 'NAME'" in result.output
+     typer.core.rich = rich
+ 
+ 
+Index: typer_slim-0.15.3/tests/test_tutorial/test_arguments/test_optional/test_tutorial003.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_arguments/test_optional/test_tutorial003.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_arguments/test_optional/test_tutorial003.py
+@@ -31,7 +31,7 @@ def test_call_no_arg_no_rich():
+     typer.core.rich = None
+     result = runner.invoke(app)
+     assert result.exit_code != 0
+-    assert "Error: Missing argument 'NAME'" in result.stdout
++    assert "Error: Missing argument 'NAME'" in result.output
+     typer.core.rich = rich
+ 
+ 
+Index: typer_slim-0.15.3/tests/test_tutorial/test_multiple_values/test_arguments_with_multiple_values/test_tutorial002.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_multiple_values/test_arguments_with_multiple_values/test_tutorial002.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_multiple_values/test_arguments_with_multiple_values/test_tutorial002.py
+@@ -30,7 +30,7 @@ def test_defaults():
+ def test_invalid_args():
+     result = runner.invoke(app, ["Draco", "Hagrid"])
+     assert result.exit_code != 0
+-    assert "Argument 'names' takes 3 values" in result.stdout
++    assert "Argument 'names' takes 3 values" in result.output
+ 
+ 
+ def test_valid_args():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_multiple_values/test_arguments_with_multiple_values/test_tutorial002_an.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_multiple_values/test_arguments_with_multiple_values/test_tutorial002_an.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_multiple_values/test_arguments_with_multiple_values/test_tutorial002_an.py
+@@ -32,7 +32,7 @@ def test_defaults():
+ def test_invalid_args():
+     result = runner.invoke(app, ["Draco", "Hagrid"])
+     assert result.exit_code != 0
+-    assert "Argument 'names' takes 3 values" in result.stdout
++    assert "Argument 'names' takes 3 values" in result.output
+ 
+ 
+ def test_valid_args():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_datetime/test_tutorial001.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_parameter_types/test_datetime/test_tutorial001.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_datetime/test_tutorial001.py
+@@ -30,7 +30,7 @@ def test_invalid():
+     assert result.exit_code != 0
+     assert (
+         "Invalid value for 'BIRTH:[%Y-%m-%d|%Y-%m-%dT%H:%M:%S|%Y-%m-%d %H:%M:%S]':"
+-        in result.stdout
++        in result.output
+     )
+     assert "'july-19-1989' does not match the formats" in result.output
+     assert "%Y-%m-%d" in result.output
+Index: typer_slim-0.15.3/tests/test_tutorial/test_terminating/test_tutorial003.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_terminating/test_tutorial003.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_terminating/test_tutorial003.py
+@@ -38,8 +38,8 @@ def test_root_no_rich():
+     typer.core.rich = None
+     result = runner.invoke(app, ["root"])
+     assert result.exit_code == 1
+-    assert "The root user is reserved" in result.stdout
+-    assert "Aborted!" in result.stdout
++    assert "The root user is reserved" in result.output
++    assert "Aborted!" in result.output
+     typer.core.rich = rich
+ 
+ 
+Index: typer_slim-0.15.3/tests/test_tutorial/test_using_click/test_tutorial003.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_using_click/test_tutorial003.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_using_click/test_tutorial003.py
+@@ -10,7 +10,7 @@ runner = CliRunner()
+ 
+ def test_cli():
+     result = runner.invoke(mod.typer_click_object, [])
+-    assert "Missing command" in result.stdout
++    assert "Missing command" in result.output
+ 
+ 
+ def test_help():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_using_click/test_tutorial004.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_using_click/test_tutorial004.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_using_click/test_tutorial004.py
+@@ -10,9 +10,9 @@ runner = CliRunner()
+ 
+ def test_cli():
+     result = runner.invoke(mod.cli, [])
+-    assert "Usage" in result.stdout
+-    assert "dropdb" in result.stdout
+-    assert "sub" in result.stdout
++    assert "Usage" in result.output
++    assert "dropdb" in result.output
++    assert "sub" in result.output
+ 
+ 
+ def test_typer():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_options/test_required/test_tutorial001.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_options/test_required/test_tutorial001.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_options/test_required/test_tutorial001.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import subprocess
+ import sys
+ 
+@@ -13,10 +14,18 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_1():
+     result = runner.invoke(app, ["Camila"])
+     assert result.exit_code != 0
+-    assert "Missing option '--lastname'." in result.output
++    assert f"Missing option '--lastname'{extra}." in result.output
+ 
+ 
+ def test_option_lastname():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_options/test_callback/test_tutorial001.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_options/test_callback/test_tutorial001.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_options/test_callback/test_tutorial001.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import subprocess
+ import sys
+ 
+@@ -12,6 +13,14 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_1():
+     result = runner.invoke(app, ["--name", "Camila"])
+     assert result.exit_code == 0
+@@ -21,7 +30,7 @@ def test_1():
+ def test_2():
+     result = runner.invoke(app, ["--name", "rick"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--name': Only Camila is allowed" in result.output
++    assert f"Invalid value for '--name'{extra}: Only Camila is allowed" in result.output
+ 
+ 
+ def test_script():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_options/test_callback/test_tutorial001_an.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_options/test_callback/test_tutorial001_an.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_options/test_callback/test_tutorial001_an.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import subprocess
+ import sys
+ 
+@@ -12,6 +13,14 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_1():
+     result = runner.invoke(app, ["--name", "Camila"])
+     assert result.exit_code == 0
+@@ -21,7 +30,7 @@ def test_1():
+ def test_2():
+     result = runner.invoke(app, ["--name", "rick"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--name': Only Camila is allowed" in result.output
++    assert f"Invalid value for '--name'{extra}: Only Camila is allowed" in result.output
+ 
+ 
+ def test_script():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_options/test_callback/test_tutorial003.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_options/test_callback/test_tutorial003.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_options/test_callback/test_tutorial003.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import os
+ import subprocess
+ import sys
+@@ -13,6 +14,14 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_1():
+     result = runner.invoke(app, ["--name", "Camila"])
+     assert result.exit_code == 0
+@@ -23,7 +32,7 @@ def test_1():
+ def test_2():
+     result = runner.invoke(app, ["--name", "rick"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--name': Only Camila is allowed" in result.output
++    assert f"Invalid value for '--name'{extra}: Only Camila is allowed" in result.output
+ 
+ 
+ def test_script():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_options/test_callback/test_tutorial003_an.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_options/test_callback/test_tutorial003_an.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_options/test_callback/test_tutorial003_an.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import os
+ import subprocess
+ import sys
+@@ -13,6 +14,14 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_1():
+     result = runner.invoke(app, ["--name", "Camila"])
+     assert result.exit_code == 0
+@@ -23,7 +32,7 @@ def test_1():
+ def test_2():
+     result = runner.invoke(app, ["--name", "rick"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--name': Only Camila is allowed" in result.output
++    assert f"Invalid value for '--name'{extra}: Only Camila is allowed" in result.output
+ 
+ 
+ def test_script():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_options/test_callback/test_tutorial004.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_options/test_callback/test_tutorial004.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_options/test_callback/test_tutorial004.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import os
+ import subprocess
+ import sys
+@@ -13,6 +14,14 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_1():
+     result = runner.invoke(app, ["--name", "Camila"])
+     assert result.exit_code == 0
+@@ -23,7 +32,7 @@ def test_1():
+ def test_2():
+     result = runner.invoke(app, ["--name", "rick"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--name': Only Camila is allowed" in result.output
++    assert f"Invalid value for '--name'{extra}: Only Camila is allowed" in result.output
+ 
+ 
+ def test_script():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_options/test_callback/test_tutorial004_an.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_options/test_callback/test_tutorial004_an.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_options/test_callback/test_tutorial004_an.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import os
+ import subprocess
+ import sys
+@@ -13,6 +14,14 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_1():
+     result = runner.invoke(app, ["--name", "Camila"])
+     assert result.exit_code == 0
+@@ -23,7 +32,7 @@ def test_1():
+ def test_2():
+     result = runner.invoke(app, ["--name", "rick"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--name': Only Camila is allowed" in result.output
++    assert f"Invalid value for '--name'{extra}: Only Camila is allowed" in result.output
+ 
+ 
+ def test_script():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_options/test_required/test_tutorial001_an.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_options/test_required/test_tutorial001_an.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_options/test_required/test_tutorial001_an.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import subprocess
+ import sys
+ 
+@@ -13,10 +14,18 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_1():
+     result = runner.invoke(app, ["Camila"])
+     assert result.exit_code != 0
+-    assert "Missing option '--lastname'." in result.output
++    assert f"Missing option '--lastname'{extra}." in result.output
+ 
+ 
+ def test_option_lastname():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_options/test_version/test_tutorial003.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_options/test_version/test_tutorial003.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_options/test_version/test_tutorial003.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import os
+ import subprocess
+ import sys
+@@ -13,6 +14,14 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_1():
+     result = runner.invoke(app, ["--name", "Rick", "--version"])
+     assert result.exit_code == 0
+@@ -22,7 +31,7 @@ def test_1():
+ def test_2():
+     result = runner.invoke(app, ["--name", "rick"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--name': Only Camila is allowed" in result.output
++    assert f"Invalid value for '--name'{extra}: Only Camila is allowed" in result.output
+ 
+ 
+ def test_3():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_options/test_version/test_tutorial003_an.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_options/test_version/test_tutorial003_an.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_options/test_version/test_tutorial003_an.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import os
+ import subprocess
+ import sys
+@@ -13,6 +14,14 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_1():
+     result = runner.invoke(app, ["--name", "Rick", "--version"])
+     assert result.exit_code == 0
+@@ -22,7 +31,7 @@ def test_1():
+ def test_2():
+     result = runner.invoke(app, ["--name", "rick"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--name': Only Camila is allowed" in result.output
++    assert f"Invalid value for '--name'{extra}: Only Camila is allowed" in result.output
+ 
+ 
+ def test_3():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_enum/test_tutorial001.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_parameter_types/test_enum/test_tutorial001.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_enum/test_tutorial001.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import subprocess
+ import sys
+ 
+@@ -12,6 +13,14 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_help():
+     result = runner.invoke(app, ["--help"])
+     assert result.exit_code == 0
+@@ -29,7 +38,7 @@ def test_main():
+ def test_invalid_case():
+     result = runner.invoke(app, ["--network", "CONV"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--network': 'CONV' is not one of" in result.output
++    assert f"Invalid value for '--network'{extra}: 'CONV' is not one of" in result.output
+     assert "simple" in result.output
+     assert "conv" in result.output
+     assert "lstm" in result.output
+@@ -38,7 +47,7 @@ def test_invalid_case():
+ def test_invalid_other():
+     result = runner.invoke(app, ["--network", "capsule"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--network': 'capsule' is not one of" in result.output
++    assert f"Invalid value for '--network'{extra}: 'capsule' is not one of" in result.output
+     assert "simple" in result.output
+     assert "conv" in result.output
+     assert "lstm" in result.output
+Index: typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_enum/test_tutorial003.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_parameter_types/test_enum/test_tutorial003.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_enum/test_tutorial003.py
+@@ -14,7 +14,7 @@ app.command()(mod.main)
+ 
+ def test_help():
+     result = runner.invoke(app, ["--help"])
+-    assert result.exit_code == 0
++    assert result.exit_code in (0, 2)
+     assert "--groceries" in result.output
+     assert "[Eggs|Bacon|Cheese]" in result.output
+     assert "default: Eggs, Cheese" in result.output
+@@ -22,7 +22,7 @@ def test_help():
+ 
+ def test_call_no_arg():
+     result = runner.invoke(app)
+-    assert result.exit_code == 0
++    assert result.exit_code in (0, 2)
+     assert "Buying groceries: Eggs, Cheese" in result.output
+ 
+ 
+Index: typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_enum/test_tutorial003_an.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_parameter_types/test_enum/test_tutorial003_an.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_enum/test_tutorial003_an.py
+@@ -14,7 +14,7 @@ app.command()(mod.main)
+ 
+ def test_help():
+     result = runner.invoke(app, ["--help"])
+-    assert result.exit_code == 0
++    assert result.exit_code in (0, 2)
+     assert "--groceries" in result.output
+     assert "[Eggs|Bacon|Cheese]" in result.output
+     assert "default: Eggs, Cheese" in result.output
+@@ -22,7 +22,7 @@ def test_help():
+ 
+ def test_call_no_arg():
+     result = runner.invoke(app)
+-    assert result.exit_code == 0
++    assert result.exit_code in (0, 2)
+     assert "Buying groceries: Eggs, Cheese" in result.output
+ 
+ 
+Index: typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_index/test_tutorial001.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_parameter_types/test_index/test_tutorial001.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_index/test_tutorial001.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import subprocess
+ import sys
+ 
+@@ -12,9 +13,17 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_help():
+     result = runner.invoke(app, ["--help"])
+-    assert result.exit_code == 0
++    assert result.exit_code in (0, 2)
+     assert "--age" in result.output
+     assert "INTEGER" in result.output
+     assert "--height-meters" in result.output
+@@ -35,7 +44,7 @@ def test_params():
+ def test_invalid():
+     result = runner.invoke(app, ["Camila", "--age", "15.3"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--age': '15.3' is not a valid integer" in result.output
++    assert f"Invalid value for '--age'{extra}: '15.3' is not a valid integer" in result.output
+ 
+ 
+ def test_script():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_path/test_tutorial002.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_parameter_types/test_path/test_tutorial002.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_path/test_tutorial002.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import subprocess
+ import sys
+ from pathlib import Path
+@@ -13,14 +14,23 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_not_exists(tmpdir):
+     config_file = Path(tmpdir) / "config.txt"
+     if config_file.exists():  # pragma: no cover
+         config_file.unlink()
+     result = runner.invoke(app, ["--config", f"{config_file}"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--config': File" in result.output
+-    assert "does not exist" in result.output
++    assert f"Invalid value for '--config'{extra}: File" in result.output
++    assert "does not" in result.output
++    assert "exist" in result.output
+ 
+ 
+ def test_exists(tmpdir):
+@@ -35,7 +45,7 @@ def test_exists(tmpdir):
+ def test_dir():
+     result = runner.invoke(app, ["--config", "./"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--config': File './' is a directory." in result.output
++    assert f"Invalid value for '--config'{extra}: File './' is a directory." in result.output
+ 
+ 
+ def test_script():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_path/test_tutorial002_an.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_parameter_types/test_path/test_tutorial002_an.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_path/test_tutorial002_an.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import subprocess
+ import sys
+ from pathlib import Path
+@@ -13,14 +14,23 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_not_exists(tmpdir):
+     config_file = Path(tmpdir) / "config.txt"
+     if config_file.exists():  # pragma: no cover
+         config_file.unlink()
+     result = runner.invoke(app, ["--config", f"{config_file}"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--config': File" in result.output
+-    assert "does not exist" in result.output
++    assert f"Invalid value for '--config'{extra}: File" in result.output
++    assert "does not" in result.output
++    assert "exist" in result.output
+ 
+ 
+ def test_exists(tmpdir):
+@@ -35,7 +45,7 @@ def test_exists(tmpdir):
+ def test_dir():
+     result = runner.invoke(app, ["--config", "./"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--config': File './' is a directory." in result.output
++    assert f"Invalid value for '--config'{extra}: File './' is a directory." in result.output
+ 
+ 
+ def test_script():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_commands/test_index/test_tutorial003.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_commands/test_index/test_tutorial003.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_commands/test_index/test_tutorial003.py
+@@ -12,7 +12,7 @@ runner = CliRunner()
+ 
+ def test_no_arg():
+     result = runner.invoke(app)
+-    assert result.exit_code == 0
++    assert result.exit_code in (0, 2)
+     assert "[OPTIONS] COMMAND [ARGS]..." in result.output
+     assert "Commands" in result.output
+     assert "create" in result.output
+Index: typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_number/test_tutorial001.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_parameter_types/test_number/test_tutorial001.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_number/test_tutorial001.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import subprocess
+ import sys
+ 
+@@ -13,6 +14,14 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_help():
+     result = runner.invoke(app, ["--help"])
+     assert result.exit_code == 0
+@@ -53,16 +62,17 @@ def test_invalid_id():
+ def test_invalid_age():
+     result = runner.invoke(app, ["5", "--age", "15"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--age': 15 is not in the range x>=18" in result.output
++    assert f"Invalid value for '--age'{extra}: 15 is not in the range x>=18" in result.output
+ 
+ 
+ def test_invalid_score():
+     result = runner.invoke(app, ["5", "--age", "20", "--score", "100.5"])
+     assert result.exit_code != 0
+     assert (
+-        "Invalid value for '--score': 100.5 is not in the range x<=100."
++        f"Invalid value for '--score'{extra}: 100.5 is not in the range"
+         in result.output
+     )
++    assert "x<=100." in result.output
+ 
+ 
+ def test_negative_score():
+Index: typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_number/test_tutorial001_an.py
+===================================================================
+--- typer_slim-0.15.3.orig/tests/test_tutorial/test_parameter_types/test_number/test_tutorial001_an.py
++++ typer_slim-0.15.3/tests/test_tutorial/test_parameter_types/test_number/test_tutorial001_an.py
+@@ -1,3 +1,4 @@
++import importlib.metadata
+ import subprocess
+ import sys
+ 
+@@ -13,6 +14,14 @@ app = typer.Typer()
+ app.command()(mod.main)
+ 
+ 
++click_version_str = importlib.metadata.version("click")
++click_version = tuple(int(part) for part in click_version_str.split('.'))
++if click_version >= (8, 2):
++    extra = " (env var: 'None')"
++else:
++    extra = ""
++
++
+ def test_help():
+     result = runner.invoke(app, ["--help"])
+     assert result.exit_code == 0
+@@ -53,17 +62,17 @@ def test_invalid_id():
+ def test_invalid_age():
+     result = runner.invoke(app, ["5", "--age", "15"])
+     assert result.exit_code != 0
+-    assert "Invalid value for '--age': 15 is not in the range x>=18" in result.output
++    assert f"Invalid value for '--age'{extra}: 15 is not in the range x>=18" in result.output
+ 
+ 
+ def test_invalid_score():
+     result = runner.invoke(app, ["5", "--age", "20", "--score", "100.5"])
+     assert result.exit_code != 0
+     assert (
+-        "Invalid value for '--score': 100.5 is not in the range x<=100."
++        f"Invalid value for '--score'{extra}: 100.5 is not in the range"
+         in result.output
+     )
+-
++    assert "x<=100." in result.output
+ 
+ def test_negative_score():
+     result = runner.invoke(app, ["5", "--age", "20", "--score", "-5"])