Merge pull request #104 from DanCardin/dc/commandrunner-signature

fix: Correct the testing.CommandRunner deps signature.

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## 0.16
 
+### 0.16.6
+
+- fix: Correct the testing.CommandRunner deps signature.
+
+### 0.16.5
+
+- fix: Error short help should be contextual to the failing command.
+
 ### 0.16.4
 
 - fix: Ensure optional bool retains bool action inference.

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cappa"
-version = "0.16.5"
+version = "0.16.6"
 description = "Declarative CLI argument parser."
 
 repository = "https://github.com/dancardin/cappa"

src/cappa/base.py

@@ -14,7 +14,7 @@
  create_help_arg,
  create_version_arg,
 )
-from cappa.invoke import resolve_callable
+from cappa.invoke import Dep, resolve_callable
 from cappa.output import Output
 
 if typing.TYPE_CHECKING:
@@ -79,7 +79,9 @@ def parse(
 def invoke(
  obj: type | Command,
  *,
- deps: typing.Sequence[typing.Callable] | None = None,
+ deps: typing.Sequence[typing.Callable]
+ | typing.Mapping[typing.Callable, Dep | typing.Any]
+ | None = None,
  argv: list[str] | None = None,
  backend: typing.Callable | None = None,
  color: bool = True,
@@ -143,7 +145,9 @@ def invoke(
 async def invoke_async(
  obj: type | Command,
  *,
- deps: typing.Sequence[typing.Callable] | None = None,
+ deps: typing.Sequence[typing.Callable]
+ | typing.Mapping[typing.Callable, Dep | typing.Any]
+ | None = None,
  argv: list[str] | None = None,
  backend: typing.Callable | None = None,
  color: bool = True,

src/cappa/testing.py

@@ -17,7 +17,9 @@ class RunnerArgs(typing.TypedDict, total=False):
  """Available kwargs for `parse` and `invoke` function, to match `CommandRunner` fields."""
 
  obj: type
- deps: typing.Sequence[typing.Callable]
+ deps: typing.Sequence[typing.Callable] | typing.Mapping[
+ typing.Callable, cappa.Dep | typing.Any
+ ] | None
  backend: typing.Callable | None
  output: cappa.Output | None
  color: bool
@@ -70,7 +72,9 @@ class CommandRunner:
  """
 
  obj: type | None = None
- deps: typing.Sequence[typing.Callable] | None = None
+ deps: typing.Sequence[typing.Callable] | typing.Mapping[
+ typing.Callable, cappa.Dep | typing.Any
+ ] | None = None
  backend: typing.Callable | None = None
  output: cappa.Output | None = None
  color: bool = True