omdev 0.0.0.dev387__tar.gz → 0.0.0.dev389__tar.gz

{omdev-0.0.0.dev387/omdev.egg-info → omdev-0.0.0.dev389}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev387
+Version: 0.0.0.dev389
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,14 +14,14 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev387
+Requires-Dist: omlish==0.0.0.dev389
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.22; extra == "all"
-Requires-Dist: markdown-it-py~=3.0; extra == "all"
-Requires-Dist: mdit-py-plugins~=0.4; extra == "all"
+Requires-Dist: markdown-it-py~=4.0; extra == "all"
+Requires-Dist: mdit-py-plugins~=0.5; extra == "all"
 Requires-Dist: pygments~=2.19; extra == "all"
 Requires-Dist: mypy~=1.17; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
@@ -34,8 +34,8 @@ Requires-Dist: pycparser~=2.22; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
 Provides-Extra: doc
 Requires-Dist: docutils~=0.22; extra == "doc"
-Requires-Dist: markdown-it-py~=3.0; extra == "doc"
-Requires-Dist: mdit-py-plugins~=0.4; extra == "doc"
+Requires-Dist: markdown-it-py~=4.0; extra == "doc"
+Requires-Dist: mdit-py-plugins~=0.5; extra == "doc"
 Requires-Dist: pygments~=2.19; extra == "doc"
 Provides-Extra: mypy
 Requires-Dist: mypy~=1.17; extra == "mypy"

{omdev-0.0.0.dev387 → omdev-0.0.0.dev389}/omdev/__about__.py

@@ -24,8 +24,8 @@ class Project(ProjectBase):
         'doc': [
             'docutils ~= 0.22',
 
-            'markdown-it-py ~= 3.0',
-            'mdit-py-plugins ~= 0.4',
+            'markdown-it-py ~= 4.0',
+            'mdit-py-plugins ~= 0.5',
 
             'pygments ~= 2.19',
         ],

{omdev-0.0.0.dev387 → omdev-0.0.0.dev389}/omdev/amalg/typing.py

@@ -11,6 +11,8 @@ from ..tokens import all as tks
 TYPE_ALIAS_COMMENT = '# ta.TypeAlias'
 NOQA_TYPE_ALIAS_COMMENT = TYPE_ALIAS_COMMENT + '  # noqa'
 
+NO_MOVE_COMMENT = '# omlish-amalg-typing-no-move'
+
 
 @dc.dataclass(frozen=True, kw_only=True)
 class Typing:
@@ -28,6 +30,8 @@ def _is_typing(
         exclude_newtypes: bool = False,
 ) -> bool:
     es = tks.join_toks(lts).strip()
+    if es.endswith(NO_MOVE_COMMENT):
+        return False
     if any(es.endswith(sfx) for sfx in (TYPE_ALIAS_COMMENT, NOQA_TYPE_ALIAS_COMMENT)):
         return True
 

{omdev-0.0.0.dev387 → omdev-0.0.0.dev389}/omdev/ptk/confirm.py

@@ -1,3 +1,5 @@
+import typing as ta
+
 from prompt_toolkit.formatted_text import merge_formatted_text
 from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.key_binding import KeyPressEvent
@@ -47,7 +49,7 @@ async def m_strict_confirm(message: str = 'Confirm?', suffix: str = ' (y/n) ') -
 
     while True:
         session = create_strict_confirm_session(message, suffix)
-        ret = await lang.make_maysync(session.prompt, session.prompt_async).m()
+        ret = await lang.make_maysync(session.prompt, ta.cast(ta.Any, session.prompt_async))().m()
 
         if isinstance(ret, str):
             check.empty(ret)

{omdev-0.0.0.dev387 → omdev-0.0.0.dev389}/omdev/scripts/ci.py

@@ -5976,6 +5976,17 @@ class SubprocessRun:
             async_subprocesses = self._DEFAULT_ASYNC_SUBPROCESSES
         return await check.not_none(async_subprocesses).run_(self.replace(**kwargs))
 
+    _DEFAULT_MAYSYNC_SUBPROCESSES: ta.ClassVar[ta.Optional[ta.Any]] = None  # AbstractMaysyncSubprocesses
+
+    async def maysync_run(
+            self,
+            maysync_subprocesses: ta.Optional[ta.Any] = None,  # AbstractMaysyncSubprocesses
+            **kwargs: ta.Any,
+    ) -> SubprocessRunOutput:
+        if maysync_subprocesses is None:
+            maysync_subprocesses = self._DEFAULT_MAYSYNC_SUBPROCESSES
+        return await check.not_none(maysync_subprocesses).run_(self.replace(**kwargs))
+
 
 SubprocessRun._FIELD_NAMES = frozenset(fld.name for fld in dc.fields(SubprocessRun))  # noqa
 
@@ -6008,6 +6019,13 @@ class SubprocessRunnable(abc.ABC, ta.Generic[T]):
     ) -> T:
         return self.handle_run_output(await self.make_run().async_run(async_subprocesses, **kwargs))
 
+    async def maysync_run(
+            self,
+            maysync_subprocesses: ta.Optional[ta.Any] = None,  # AbstractMaysyncSubprocesses
+            **kwargs: ta.Any,
+    ) -> T:
+        return self.handle_run_output(await self.make_run().maysync_run(maysync_subprocesses, **kwargs))
+
 
 ########################################
 # ../../../omlish/text/mangle.py
@@ -11058,7 +11076,7 @@ class CoroHttpServerSocketHandler(SocketHandler_):
 
 
 ########################################
-# ../../../omlish/subprocesses/async_.py
+# ../../../omlish/subprocesses/asyncs.py
 
 
 ##
@@ -11066,7 +11084,7 @@ class CoroHttpServerSocketHandler(SocketHandler_):
 
 class AbstractAsyncSubprocesses(BaseSubprocesses):
     @abc.abstractmethod
-    async def run_(self, run: SubprocessRun) -> SubprocessRunOutput:
+    def run_(self, run: SubprocessRun) -> ta.Awaitable[SubprocessRunOutput]:
         raise NotImplementedError
 
     def run(
@@ -11089,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()
 
     #
 
@@ -11268,6 +11296,8 @@ class Subprocesses(AbstractSubprocesses):
             stderr=proc.stderr,  # noqa
         )
 
+    #
+
     def check_call(
             self,
             *cmd: str,
@@ -11831,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-0.0.0.dev387 → omdev-0.0.0.dev389}/omdev/scripts/interp.py

@@ -3886,6 +3886,17 @@ class SubprocessRun:
             async_subprocesses = self._DEFAULT_ASYNC_SUBPROCESSES
         return await check.not_none(async_subprocesses).run_(self.replace(**kwargs))
 
+    _DEFAULT_MAYSYNC_SUBPROCESSES: ta.ClassVar[ta.Optional[ta.Any]] = None  # AbstractMaysyncSubprocesses
+
+    async def maysync_run(
+            self,
+            maysync_subprocesses: ta.Optional[ta.Any] = None,  # AbstractMaysyncSubprocesses
+            **kwargs: ta.Any,
+    ) -> SubprocessRunOutput:
+        if maysync_subprocesses is None:
+            maysync_subprocesses = self._DEFAULT_MAYSYNC_SUBPROCESSES
+        return await check.not_none(maysync_subprocesses).run_(self.replace(**kwargs))
+
 
 SubprocessRun._FIELD_NAMES = frozenset(fld.name for fld in dc.fields(SubprocessRun))  # noqa
 
@@ -3918,6 +3929,13 @@ class SubprocessRunnable(abc.ABC, ta.Generic[T]):
     ) -> T:
         return self.handle_run_output(await self.make_run().async_run(async_subprocesses, **kwargs))
 
+    async def maysync_run(
+            self,
+            maysync_subprocesses: ta.Optional[ta.Any] = None,  # AbstractMaysyncSubprocesses
+            **kwargs: ta.Any,
+    ) -> T:
+        return self.handle_run_output(await self.make_run().maysync_run(maysync_subprocesses, **kwargs))
+
 
 ########################################
 # ../types.py
@@ -4517,7 +4535,7 @@ class InterpResolver:
 
 
 ########################################
-# ../../../omlish/subprocesses/async_.py
+# ../../../omlish/subprocesses/asyncs.py
 
 
 ##
@@ -4525,7 +4543,7 @@ class InterpResolver:
 
 class AbstractAsyncSubprocesses(BaseSubprocesses):
     @abc.abstractmethod
-    async def run_(self, run: SubprocessRun) -> SubprocessRunOutput:
+    def run_(self, run: SubprocessRun) -> ta.Awaitable[SubprocessRunOutput]:
         raise NotImplementedError
 
     def run(
@@ -4548,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()
 
     #
 
@@ -4799,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-0.0.0.dev387 → omdev-0.0.0.dev389}/omdev/scripts/pyproject.py

@@ -6336,6 +6336,17 @@ class SubprocessRun:
             async_subprocesses = self._DEFAULT_ASYNC_SUBPROCESSES
         return await check.not_none(async_subprocesses).run_(self.replace(**kwargs))
 
+    _DEFAULT_MAYSYNC_SUBPROCESSES: ta.ClassVar[ta.Optional[ta.Any]] = None  # AbstractMaysyncSubprocesses
+
+    async def maysync_run(
+            self,
+            maysync_subprocesses: ta.Optional[ta.Any] = None,  # AbstractMaysyncSubprocesses
+            **kwargs: ta.Any,
+    ) -> SubprocessRunOutput:
+        if maysync_subprocesses is None:
+            maysync_subprocesses = self._DEFAULT_MAYSYNC_SUBPROCESSES
+        return await check.not_none(maysync_subprocesses).run_(self.replace(**kwargs))
+
 
 SubprocessRun._FIELD_NAMES = frozenset(fld.name for fld in dc.fields(SubprocessRun))  # noqa
 
@@ -6368,6 +6379,13 @@ class SubprocessRunnable(abc.ABC, ta.Generic[T]):
     ) -> T:
         return self.handle_run_output(await self.make_run().async_run(async_subprocesses, **kwargs))
 
+    async def maysync_run(
+            self,
+            maysync_subprocesses: ta.Optional[ta.Any] = None,  # AbstractMaysyncSubprocesses
+            **kwargs: ta.Any,
+    ) -> T:
+        return self.handle_run_output(await self.make_run().maysync_run(maysync_subprocesses, **kwargs))
+
 
 ########################################
 # ../../interp/types.py
@@ -6967,7 +6985,7 @@ class InterpResolver:
 
 
 ########################################
-# ../../../omlish/subprocesses/async_.py
+# ../../../omlish/subprocesses/asyncs.py
 
 
 ##
@@ -6975,7 +6993,7 @@ class InterpResolver:
 
 class AbstractAsyncSubprocesses(BaseSubprocesses):
     @abc.abstractmethod
-    async def run_(self, run: SubprocessRun) -> SubprocessRunOutput:
+    def run_(self, run: SubprocessRun) -> ta.Awaitable[SubprocessRunOutput]:
         raise NotImplementedError
 
     def run(
@@ -6998,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()
 
     #
 
@@ -7177,6 +7205,8 @@ class Subprocesses(AbstractSubprocesses):
             stderr=proc.stderr,  # noqa
         )
 
+    #
+
     def check_call(
             self,
             *cmd: str,
@@ -7444,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.dev387 → omdev-0.0.0.dev389/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev387
+Version: 0.0.0.dev389
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,14 +14,14 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev387
+Requires-Dist: omlish==0.0.0.dev389
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.22; extra == "all"
-Requires-Dist: markdown-it-py~=3.0; extra == "all"
-Requires-Dist: mdit-py-plugins~=0.4; extra == "all"
+Requires-Dist: markdown-it-py~=4.0; extra == "all"
+Requires-Dist: mdit-py-plugins~=0.5; extra == "all"
 Requires-Dist: pygments~=2.19; extra == "all"
 Requires-Dist: mypy~=1.17; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
@@ -34,8 +34,8 @@ Requires-Dist: pycparser~=2.22; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
 Provides-Extra: doc
 Requires-Dist: docutils~=0.22; extra == "doc"
-Requires-Dist: markdown-it-py~=3.0; extra == "doc"
-Requires-Dist: mdit-py-plugins~=0.4; extra == "doc"
+Requires-Dist: markdown-it-py~=4.0; extra == "doc"
+Requires-Dist: mdit-py-plugins~=0.5; extra == "doc"
 Requires-Dist: pygments~=2.19; extra == "doc"
 Provides-Extra: mypy
 Requires-Dist: mypy~=1.17; extra == "mypy"

{omdev-0.0.0.dev387 → omdev-0.0.0.dev389}/omdev.egg-info/requires.txt

@@ -1,12 +1,12 @@
-omlish==0.0.0.dev387
+omlish==0.0.0.dev389
 
 [all]
 black~=25.1
 pycparser~=2.22
 pcpp~=1.30
 docutils~=0.22
-markdown-it-py~=3.0
-mdit-py-plugins~=0.4
+markdown-it-py~=4.0
+mdit-py-plugins~=0.5
 pygments~=2.19
 mypy~=1.17
 gprof2dot~=2025.4
@@ -22,8 +22,8 @@ pcpp~=1.30
 
 [doc]
 docutils~=0.22
-markdown-it-py~=3.0
-mdit-py-plugins~=0.4
+markdown-it-py~=4.0
+mdit-py-plugins~=0.5
 pygments~=2.19
 
 [mypy]

{omdev-0.0.0.dev387 → omdev-0.0.0.dev389}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev387'
+version = '0.0.0.dev389'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev387',
+    'omlish == 0.0.0.dev389',
 ]
 
 [project.optional-dependencies]
@@ -33,8 +33,8 @@ all = [
     'pycparser ~= 2.22',
     'pcpp ~= 1.30',
     'docutils ~= 0.22',
-    'markdown-it-py ~= 3.0',
-    'mdit-py-plugins ~= 0.4',
+    'markdown-it-py ~= 4.0',
+    'mdit-py-plugins ~= 0.5',
     'pygments ~= 2.19',
     'mypy ~= 1.17',
     'gprof2dot ~= 2025.4',
@@ -50,8 +50,8 @@ c = [
 ]
 doc = [
     'docutils ~= 0.22',
-    'markdown-it-py ~= 3.0',
-    'mdit-py-plugins ~= 0.4',
+    'markdown-it-py ~= 4.0',
+    'mdit-py-plugins ~= 0.5',
     'pygments ~= 2.19',
 ]
 mypy = [