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

omdev/scripts/ci.py

@@ -11076,15 +11076,15 @@ class CoroHttpServerSocketHandler(SocketHandler_):
 
 
 ########################################
-# ../../../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(
@@ -11107,31 +11107,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()
 
     #
 
@@ -11166,10 +11176,6 @@ class _AbstractAsyncSubprocesses(BaseSubprocesses):
             return ret.decode().strip()
 
 
-class AbstractAsyncSubprocesses(_AbstractAsyncSubprocesses, abc.ABC):
-    pass
-
-
 ########################################
 # ../../../omlish/subprocesses/sync.py
 """
@@ -11290,6 +11296,8 @@ class Subprocesses(AbstractSubprocesses):
             stderr=proc.stderr,  # noqa
         )
 
+    #
+
     def check_call(
             self,
             *cmd: str,
@@ -11853,25 +11861,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()
 

omdev/scripts/interp.py

@@ -4535,15 +4535,15 @@ class InterpResolver:
 
 
 ########################################
-# ../../../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(
@@ -4566,31 +4566,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()
 
     #
 
@@ -4625,10 +4635,6 @@ class _AbstractAsyncSubprocesses(BaseSubprocesses):
             return ret.decode().strip()
 
 
-class AbstractAsyncSubprocesses(_AbstractAsyncSubprocesses, abc.ABC):
-    pass
-
-
 ########################################
 # ../../../omlish/asyncs/asyncio/subprocesses.py
 
@@ -4821,25 +4827,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()
 

omdev/scripts/pyproject.py

@@ -6985,15 +6985,15 @@ class InterpResolver:
 
 
 ########################################
-# ../../../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(
@@ -7016,31 +7016,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()
 
     #
 
@@ -7075,10 +7085,6 @@ class _AbstractAsyncSubprocesses(BaseSubprocesses):
             return ret.decode().strip()
 
 
-class AbstractAsyncSubprocesses(_AbstractAsyncSubprocesses, abc.ABC):
-    pass
-
-
 ########################################
 # ../../../omlish/subprocesses/sync.py
 """
@@ -7199,6 +7205,8 @@ class Subprocesses(AbstractSubprocesses):
             stderr=proc.stderr,  # noqa
         )
 
+    #
+
     def check_call(
             self,
             *cmd: str,
@@ -7466,25 +7474,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()
 

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

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

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

@@ -265,9 +265,9 @@ omdev/pyproject/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQo04dR1czcc,838
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
-omdev/scripts/ci.py,sha256=a5-VsXAdhiYQrmzjOnbGAwFpIqjf-IhCKzYQ680FhUY,362941
-omdev/scripts/interp.py,sha256=EUuFfIu_YMSZYU8HFshPfs9L_urVOHCZXrDkmVvIL9w,158933
-omdev/scripts/pyproject.py,sha256=_UBZ4Fgq9zfSQJOLt1DN6az2-g5sjySD1VoNP-Fr7Xc,270431
+omdev/scripts/ci.py,sha256=sReH_mR0BiE3-KPBD2VVEyKrUJNJhcTF0oeSm7pmyyg,362502
+omdev/scripts/interp.py,sha256=2xNG-ObiPC-F5eV_nTHq2u-V3Hyuo_6KblPFCBhm2mA,158487
+omdev/scripts/pyproject.py,sha256=DL5q2gsnGChTTuzSHn1PprW2kl3ti_K60JXnKLZdA40,269992
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -316,9 +316,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=ao5mdrpiSU4AZ8mBozoEaV3UVlmVTnRG9wD9XP70MZE,11429
-omdev-0.0.0.dev388.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev388.dist-info/METADATA,sha256=f0CxDi_EE0SYkBXRhslWdFj4lprdCk2RLZARO_qytXw,5094
-omdev-0.0.0.dev388.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev388.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev388.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev388.dist-info/RECORD,,
+omdev-0.0.0.dev389.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev389.dist-info/METADATA,sha256=9nmPj3rMVeLBxcT3m6KA9J2nOGX79pWwEzg6Dxr3Kqw,5094
+omdev-0.0.0.dev389.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev389.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev389.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev389.dist-info/RECORD,,