omlish 0.0.0.dev152__tar.gz → 0.0.0.dev154__tar.gz

{omlish-0.0.0.dev152/omlish.egg-info → omlish-0.0.0.dev154}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev152
+Version: 0.0.0.dev154
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev152 → omlish-0.0.0.dev154}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev152'
-__revision__ = '53e32242b8e9bfcfe60359cf06ca1530082fc343'
+__version__ = '0.0.0.dev154'
+__revision__ = '148f19432b8d3a70543b9466386aa540fe95b6be'
 
 
 #

omlish-0.0.0.dev154/omlish/asyncs/asyncio/all.py

@@ -0,0 +1,7 @@
+# ruff: noqa: I001
+from .asyncio import (  # noqa
+    asyncio_once,
+    get_real_current_loop,
+    drain_tasks,
+    draining_asyncio_tasks,
+)

omlish-0.0.0.dev154/omlish/asyncs/asyncio/channels.py

@@ -0,0 +1,40 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import asyncio
+import typing as ta
+
+
+class AsyncioBytesChannelTransport(asyncio.Transport):
+    def __init__(self, reader: asyncio.StreamReader) -> None:
+        super().__init__()
+
+        self.reader = reader
+        self.closed: asyncio.Future = asyncio.Future()
+
+    # @ta.override
+    def write(self, data: bytes) -> None:
+        self.reader.feed_data(data)
+
+    # @ta.override
+    def close(self) -> None:
+        self.reader.feed_eof()
+        if not self.closed.done():
+            self.closed.set_result(True)
+
+    # @ta.override
+    def is_closing(self) -> bool:
+        return self.closed.done()
+
+
+def asyncio_create_bytes_channel(
+        loop: ta.Any = None,
+) -> ta.Tuple[asyncio.StreamReader, asyncio.StreamWriter]:
+    if loop is None:
+        loop = asyncio.get_running_loop()
+
+    reader = asyncio.StreamReader()
+    protocol = asyncio.StreamReaderProtocol(reader)
+    transport = AsyncioBytesChannelTransport(reader)
+    writer = asyncio.StreamWriter(transport, protocol, reader, loop)
+
+    return reader, writer

omlish-0.0.0.dev152/omlish/lite/asyncio/asyncio.py → omlish-0.0.0.dev154/omlish/asyncs/asyncio/streams.py

@@ -1,15 +1,9 @@
 # ruff: noqa: UP006 UP007
-import asyncio.base_subprocess
-import asyncio.subprocess
+# @omlish-lite
+import asyncio
 import typing as ta
 
 
-AwaitableT = ta.TypeVar('AwaitableT', bound=ta.Awaitable)
-
-
-##
-
-
 ASYNCIO_DEFAULT_BUFFER_LIMIT = 2 ** 16
 
 
@@ -49,15 +43,3 @@ async def asyncio_open_stream_writer(
         None,
         loop,
     )
-
-
-##
-
-
-def asyncio_maybe_timeout(
-        fut: AwaitableT,
-        timeout: ta.Optional[float] = None,
-) -> AwaitableT:
-    if timeout is not None:
-        fut = asyncio.wait_for(fut, timeout)  # type: ignore
-    return fut

omlish-0.0.0.dev154/omlish/asyncs/asyncio/timeouts.py

@@ -0,0 +1,16 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import asyncio
+import typing as ta
+
+
+AwaitableT = ta.TypeVar('AwaitableT', bound=ta.Awaitable)
+
+
+def asyncio_maybe_timeout(
+        fut: AwaitableT,
+        timeout: ta.Optional[float] = None,
+) -> AwaitableT:
+    if timeout is not None:
+        fut = asyncio.wait_for(fut, timeout)  # type: ignore
+    return fut

{omlish-0.0.0.dev152 → omlish-0.0.0.dev154}/omlish/lite/asyncio/subprocesses.py

@@ -8,12 +8,12 @@ import subprocess
 import sys
 import typing as ta
 
+from ...asyncs.asyncio.timeouts import asyncio_maybe_timeout
 from ..check import check
 from ..logs import log
 from ..subprocesses import DEFAULT_SUBPROCESS_TRY_EXCEPTIONS
 from ..subprocesses import prepare_subprocess_invocation
 from ..subprocesses import subprocess_common_context
-from .asyncio import asyncio_maybe_timeout
 
 
 T = ta.TypeVar('T')
@@ -177,22 +177,25 @@ async def asyncio_subprocess_communicate(
     return await AsyncioProcessCommunicator(proc).communicate(input, timeout)  # noqa
 
 
-##
-
-
-async def _asyncio_subprocess_check_run(
+async def asyncio_subprocess_run(
         *args: str,
         input: ta.Any = None,  # noqa
         timeout: ta.Optional[float] = None,
+        check: bool = False,  # noqa
+        capture_output: ta.Optional[bool] = None,
         **kwargs: ta.Any,
 ) -> ta.Tuple[ta.Optional[bytes], ta.Optional[bytes]]:
+    if capture_output:
+        kwargs.setdefault('stdout', subprocess.PIPE)
+        kwargs.setdefault('stderr', subprocess.PIPE)
+
     args, kwargs = prepare_subprocess_invocation(*args, **kwargs)
 
     proc: asyncio.subprocess.Process
     async with asyncio_subprocess_popen(*args, **kwargs) as proc:
         stdout, stderr = await asyncio_subprocess_communicate(proc, input, timeout)
 
-    if proc.returncode:
+    if check and proc.returncode:
         raise subprocess.CalledProcessError(
             proc.returncode,
             args,
@@ -203,6 +206,9 @@ async def _asyncio_subprocess_check_run(
     return stdout, stderr
 
 
+##
+
+
 async def asyncio_subprocess_check_call(
         *args: str,
         stdout: ta.Any = sys.stderr,
@@ -210,11 +216,12 @@ async def asyncio_subprocess_check_call(
         timeout: ta.Optional[float] = None,
         **kwargs: ta.Any,
 ) -> None:
-    _, _ = await _asyncio_subprocess_check_run(
+    _, _ = await asyncio_subprocess_run(
         *args,
         stdout=stdout,
         input=input,
         timeout=timeout,
+        check=True,
         **kwargs,
     )
 
@@ -225,11 +232,12 @@ async def asyncio_subprocess_check_output(
         timeout: ta.Optional[float] = None,
         **kwargs: ta.Any,
 ) -> bytes:
-    stdout, stderr = await _asyncio_subprocess_check_run(
+    stdout, stderr = await asyncio_subprocess_run(
         *args,
         stdout=asyncio.subprocess.PIPE,
         input=input,
         timeout=timeout,
+        check=True,
         **kwargs,
     )
 

{omlish-0.0.0.dev152 → omlish-0.0.0.dev154}/omlish/testing/pytest/marks.py

@@ -7,9 +7,9 @@ from .plugins.managermarks import ManagerMark  # noqa
 
 
 if ta.TYPE_CHECKING:
-    from ...asyncs import asyncio as aiu
+    from ...asyncs.asyncio import all as aiu
 else:
-    aiu = lang.proxy_import('...asyncs.asyncio', __package__)
+    aiu = lang.proxy_import('...asyncs.asyncio.all', __package__)
 
 
 class drain_asyncio(ManagerMark):  # noqa

{omlish-0.0.0.dev152 → omlish-0.0.0.dev154/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev152
+Version: 0.0.0.dev154
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev152 → omlish-0.0.0.dev154}/omlish.egg-info/SOURCES.txt

@@ -89,12 +89,17 @@ omlish/argparse/cli.py
 omlish/asyncs/__init__.py
 omlish/asyncs/all.py
 omlish/asyncs/anyio.py
-omlish/asyncs/asyncio.py
 omlish/asyncs/asyncs.py
 omlish/asyncs/bridge.py
 omlish/asyncs/flavors.py
 omlish/asyncs/trio.py
 omlish/asyncs/trio_asyncio.py
+omlish/asyncs/asyncio/__init__.py
+omlish/asyncs/asyncio/all.py
+omlish/asyncs/asyncio/asyncio.py
+omlish/asyncs/asyncio/channels.py
+omlish/asyncs/asyncio/streams.py
+omlish/asyncs/asyncio/timeouts.py
 omlish/bootstrap/__init__.py
 omlish/bootstrap/__main__.py
 omlish/bootstrap/base.py
@@ -357,7 +362,6 @@ omlish/lite/strings.py
 omlish/lite/subprocesses.py
 omlish/lite/typing.py
 omlish/lite/asyncio/__init__.py
-omlish/lite/asyncio/asyncio.py
 omlish/lite/asyncio/subprocesses.py
 omlish/logs/__init__.py
 omlish/logs/abc.py

{omlish-0.0.0.dev152 → omlish-0.0.0.dev154}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev152'
+version = '0.0.0.dev154'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',