Fix typing

metapkg/app.py

@@ -16,7 +16,7 @@
     from cleo.io.outputs.output import Output
 
 
-class App(BaseApplication):  # type: ignore
+class App(BaseApplication):
     def __init__(self) -> None:
         super().__init__(metapkg.__name__, metapkg.__version__)
 
@@ -38,4 +38,4 @@ def main() -> int:
         cmd = getattr(metapkg_commands, cmd_name)
         app.add(cmd())
 
-    return app.run()  # type: ignore
+    return app.run()

metapkg/commands/base.py

@@ -1,5 +1,5 @@
 from cleo.commands import command as cleo_command
 
 
-class Command(cleo_command.Command):  # type: ignore
+class Command(cleo_command.Command):
     pass

metapkg/packages/repository.py

@@ -45,7 +45,7 @@ class Provider(poetry_provider.Provider):
     def __init__(
         self,
         package: poetry_pkg.Package,
-        pool: poetry_pool.Pool,
+        pool: poetry_pool.RepositoryPool,
         io: cleo_io.IO,
         *,
         installed: list[poetry_pkg.Package] | None = None,

metapkg/targets/base.py

@@ -5,6 +5,7 @@
     Literal,
     Mapping,
     NamedTuple,
+    TextIO,
 )
 
 import collections
@@ -30,6 +31,7 @@
 
 if TYPE_CHECKING:
     from cleo.io.io import IO
+    from cleo.io.outputs.stream_output import StreamOutput
     from distro import distro
     from poetry.utils import env as poetry_env
     from poetry.repositories import repository as poetry_repo
@@ -700,6 +702,13 @@ def __init__(
     def io(self) -> IO:
         return self._io
 
+    @property
+    def stream(self) -> TextIO:
+        output = self._io.output
+        if TYPE_CHECKING:
+            assert isinstance(output, StreamOutput)
+        return output.stream
+
     @property
     def root_package(self) -> mpkg_base.BundledPackage:
         return self._root_pkg

metapkg/targets/generic/build.py

@@ -373,7 +373,7 @@ def _build(self) -> None:
         tools.cmd(
             *command,
             cwd=str(self._srcroot),
-            stdout=self._io.output.stream,
+            stdout=self.stream,
             stderr=subprocess.STDOUT,
         )
 

metapkg/targets/rpm/__init__.py

@@ -220,7 +220,7 @@ def install_build_deps(self, build: rpmbuild.Build, spec: str) -> None:
             "rpm-build",
             "rpmlint",
             "yum-utils",
-            stdout=build._io.output.stream,
+            stdout=build.stream,
             stderr=subprocess.STDOUT,
         )
 
@@ -229,7 +229,7 @@ def install_build_deps(self, build: rpmbuild.Build, spec: str) -> None:
             "-y",
             spec,
             cwd=str(build.get_spec_root(relative_to="fsroot")),
-            stdout=build._io.output.stream,
+            stdout=build.stream,
             stderr=subprocess.STDOUT,
         )
 
@@ -264,7 +264,7 @@ def install_build_deps(self, build: rpmbuild.Build, spec: str) -> None:
             "install",
             "-y",
             "systemd-rpm-macros",  # for %_unitdir
-            stdout=build._io.output.stream,
+            stdout=build.stream,
             stderr=subprocess.STDOUT,
         )
 
@@ -283,7 +283,7 @@ def install_build_deps(self, build: rpmbuild.Build, spec: str) -> None:
             "-y",
             spec,
             cwd=str(build.get_spec_root(relative_to="fsroot")),
-            stdout=build._io.output.stream,
+            stdout=build.stream,
             stderr=subprocess.STDOUT,
         )
 

metapkg/targets/rpm/build.py

@@ -645,7 +645,7 @@ def _rpmbuild(self) -> None:
             "rpmbuild",
             *args,
             cwd=str(self.get_spec_root(relative_to="fsroot")),
-            stdout=self._io.output.stream,
+            stdout=self.stream,
             stderr=subprocess.STDOUT,
         )
 
@@ -654,7 +654,7 @@ def _rpmbuild(self) -> None:
             "-i",
             f"{self._root_pkg.name_slot}.spec",
             cwd=str(self.get_spec_root(relative_to="fsroot")),
-            stdout=self._io.output.stream,
+            stdout=self.stream,
             stderr=subprocess.STDOUT,
         )