derivepassphrase.git

@@ -538,7 +538,7 @@ class CommandWithHelpGroups(click.Command):

         if self.short_help:  # pragma: no cover [external-api]

             text = inspect.cleandoc(self._text(self.short_help))

         elif self.help:

-            text = click.utils.make_default_short_help(

+            text = click.utils.make_default_short_help(  # type: ignore[all]

                 self._text(self.help), limit

             )

         else:  # pragma: no cover [external-api]

@@ -247,8 +247,8 @@ class CliRunner:

         # checker, we disable static type checking for this call in

         # particular; our test suite will have to uncover any breakage

         # dynamically instead.

-        self.click_testing_clirunner = click.testing.CliRunner(  # type: ignore[misc]

-            **mix_stderr_args

+        self.click_testing_clirunner = click.testing.CliRunner(

+            **mix_stderr_args  # type: ignore[misc]

         )

     def invoke(

@@ -349,7 +349,7 @@ def _get_id(

 ) -> str | None:  # pragma: no cover[external]

     if (

         isinstance(argvalue, pytest_mark.ParameterSet)

-        and argvalue.id is not None

+        and isinstance(argvalue.id, str)

     ):

         return argvalue.id

     if callable(ids):

@@ -31,8 +31,6 @@ from tests.machinery import pytest as pytest_machinery

 if TYPE_CHECKING:

     from collections.abc import Generator

-    from typing_extensions import Literal

-

 class VersionOutputData(NamedTuple):

     derivation_schemes: dict[str, bool]