ominfra 0.0.0.dev388__py3-none-any.whl → 0.0.0.dev389__py3-none-any.whl

ominfra/scripts/manage.py

@@ -10899,15 +10899,15 @@ def _remote_execution_main() -> None:
 
 
 ########################################
-# ../../../omlish/subprocesses/async_.py
+# ../../../omlish/subprocesses/asyncs.py
 
 
 ##
 
 
-class _AbstractAsyncSubprocesses(BaseSubprocesses):
+class AbstractAsyncSubprocesses(BaseSubprocesses):
     @abc.abstractmethod
-    async def run_(self, run: SubprocessRun) -> SubprocessRunOutput:
+    def run_(self, run: SubprocessRun) -> ta.Awaitable[SubprocessRunOutput]:
         raise NotImplementedError
 
     def run(
@@ -10930,31 +10930,41 @@ class _AbstractAsyncSubprocesses(BaseSubprocesses):
 
     #
 
-    @abc.abstractmethod
     async def check_call(
             self,
             *cmd: str,
             stdout: ta.Any = sys.stderr,
             **kwargs: ta.Any,
     ) -> None:
-        raise NotImplementedError
+        await self.run(
+            *cmd,
+            stdout=stdout,
+            check=True,
+            **kwargs,
+        )
 
-    @abc.abstractmethod
     async def check_output(
             self,
             *cmd: str,
+            stdout: ta.Any = subprocess.PIPE,
             **kwargs: ta.Any,
     ) -> bytes:
-        raise NotImplementedError
-
-    #
+        return check.not_none((await self.run(
+            *cmd,
+            stdout=stdout,
+            check=True,
+            **kwargs,
+        )).stdout)
 
     async def check_output_str(
             self,
             *cmd: str,
             **kwargs: ta.Any,
     ) -> str:
-        return (await self.check_output(*cmd, **kwargs)).decode().strip()
+        return (await self.check_output(
+            *cmd,
+            **kwargs,
+        )).decode().strip()
 
     #
 
@@ -10989,10 +10999,6 @@ class _AbstractAsyncSubprocesses(BaseSubprocesses):
             return ret.decode().strip()
 
 
-class AbstractAsyncSubprocesses(_AbstractAsyncSubprocesses, abc.ABC):
-    pass
-
-
 ########################################
 # ../../../omlish/subprocesses/sync.py
 """
@@ -11113,6 +11119,8 @@ class Subprocesses(AbstractSubprocesses):
             stderr=proc.stderr,  # noqa
         )
 
+    #
+
     def check_call(
             self,
             *cmd: str,
@@ -11504,25 +11512,6 @@ class AsyncioSubprocesses(AbstractAsyncSubprocesses):
             stderr=stderr,
         )
 
-    #
-
-    async def check_call(
-            self,
-            *cmd: str,
-            stdout: ta.Any = sys.stderr,
-            **kwargs: ta.Any,
-    ) -> None:
-        with self.prepare_and_wrap(*cmd, stdout=stdout, check=True, **kwargs) as (cmd, kwargs):  # noqa
-            await self.run(*cmd, **kwargs)
-
-    async def check_output(
-            self,
-            *cmd: str,
-            **kwargs: ta.Any,
-    ) -> bytes:
-        with self.prepare_and_wrap(*cmd, stdout=subprocess.PIPE, check=True, **kwargs) as (cmd, kwargs):  # noqa
-            return check.not_none((await self.run(*cmd, **kwargs)).stdout)
-
 
 asyncio_subprocesses = AsyncioSubprocesses()
 

{ominfra-0.0.0.dev388.dist-info → ominfra-0.0.0.dev389.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev388
+Version: 0.0.0.dev389
 Summary: ominfra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev388
-Requires-Dist: omlish==0.0.0.dev388
+Requires-Dist: omdev==0.0.0.dev389
+Requires-Dist: omlish==0.0.0.dev389
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev388.dist-info → ominfra-0.0.0.dev389.dist-info}/RECORD

@@ -113,7 +113,7 @@ ominfra/manage/targets/inject.py,sha256=3M4wBkxtvymq_yhiotHlTN8iydELMjVCndyp9Bq-
 ominfra/manage/targets/targets.py,sha256=WmasYmL6xfAI7F0XvDhScFdBVxkqPkmo_gRgABmmkGA,1891
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/scripts/journald2aws.py,sha256=WOyM_3Em7F_DKB7PaGYD3hUD1L3dnvpZXNJjmNUb4xc,173849
-ominfra/scripts/manage.py,sha256=NXKWVsWSLC5aW1o14-jDXx7B33f-PFLpKOEAD_dUXHU,397014
+ominfra/scripts/manage.py,sha256=hpJkJMNA2N4fl_oXALVAUorTfwrBnR4wglLiDF_PBNI,396575
 ominfra/scripts/supervisor.py,sha256=1x2J9JmRSa6uQsIHRYK3fXp_nOR-NS7akuV55__Pf-U,306331
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -156,9 +156,9 @@ ominfra/tailscale/api.py,sha256=XASv9C_CWI-u-yX5jVzhJrkJhlwQRkYQWQQG1uJwAd8,1375
 ominfra/tailscale/cli.py,sha256=zRV7-tKB7kBah1oTVZlol-vwx1FBlnfzYAPGkeU5jX4,3543
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=auGP1LlbBJSFKUWNvQo_UzA8IsBNZBTMwEkFFRJ4FX4,6185
-ominfra-0.0.0.dev388.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev388.dist-info/METADATA,sha256=5LXSv_exxH5bWPDBlHJWZ7jfkjC7e2GvxYVRhUF0-W4,2377
-ominfra-0.0.0.dev388.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ominfra-0.0.0.dev388.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev388.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev388.dist-info/RECORD,,
+ominfra-0.0.0.dev389.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev389.dist-info/METADATA,sha256=FWz7eyDOAotC4A1MzZJI3osDUn2-8a223ymUoXBHfA8,2377
+ominfra-0.0.0.dev389.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ominfra-0.0.0.dev389.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev389.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev389.dist-info/RECORD,,