fix typehints and tests

Author: mathiasertl

.github/workflows/tests.yml

@@ -14,7 +14,10 @@ jobs:
       matrix:
         os: [ ubuntu-latest ]
         python-version: [ "3.10", "3.11", "3.12", "3.13", "3.14" ]
-        sphinx-version: [ "8.0", "8.1" ]
+        sphinx-version: [ "8.1", "8.2" ]
+        exclude:
+          - python-version: "3.10"
+            sphinx-version: "8.2"
 
     name: Python ${{ matrix.python-version }}, Sphinx ${{ matrix.sphinx-version }}
     steps:

structured_tutorials/runners/base.py

@@ -71,9 +71,9 @@ def run_shell_command(
         command: CommandType,
         show_output: bool,
         capture_output: bool = False,
-        stdin: int | io.IO[Any] | None = None,
+        stdin: int | io.BufferedReader | None = None,
         input: bytes | None = None,
-    ) -> CompletedProcess[str]:
+    ) -> CompletedProcess[bytes]:
         # Only show output if runner itself is not configured to hide all output
         if show_output:
             show_output = self.show_command_output

structured_tutorials/runners/local.py

@@ -88,6 +88,7 @@ def run_commands(self, part: CommandsPartModel) -> None:
                 if stdin_config.contents:
                     proc_input = self.render(stdin_config.contents).encode("utf-8")
                 elif stdin_config.template:  # source path, but template=True
+                    assert stdin_config.source is not None
                     with open(self.tutorial.tutorial_root / stdin_config.source) as stream:
                         stdin_template = stream.read()
                     proc_input = self.render(stdin_template).encode("utf-8")
@@ -98,7 +99,7 @@ def run_commands(self, part: CommandsPartModel) -> None:
                 and command_config.run.stdin.source
                 and not command_config.run.stdin.template
             ):
-                with open(self.tutorial.tutorial_root / stdin_config.source, "rb") as stdin:
+                with open(self.tutorial.tutorial_root / command_config.run.stdin.source, "rb") as stdin:
                     proc = self.run_shell_command(
                         command_config.command,
                         show_output=command_config.run.show_output,

tests/runners/local/test_command.py

@@ -87,9 +87,9 @@ def test_command_with_stdin(fp: FakeProcess, runner: LocalTutorialRunner) -> Non
     cat_three = fp.register("cat", stdout=b"test: {{ variable }}")
     runner.run()
 
-    assert cat_one.calls[0].kwargs["stdin"] == -1
-    assert cat_two.calls[0].kwargs["stdin"] == -1
-    assert isinstance(cat_three.calls[0].kwargs["stdin"], io.BufferedReader)
+    assert cat_one.calls[0].kwargs["stdin"] == -1  # type: ignore[index]
+    assert cat_two.calls[0].kwargs["stdin"] == -1  # type: ignore[index]
+    assert isinstance(cat_three.calls[0].kwargs["stdin"], io.BufferedReader)  # type: ignore[index]
 
 
 @pytest.mark.tutorial("command-hide-output")