omdev 0.0.0.dev556__tar.gz → 0.0.2__tar.gz

{omdev-0.0.0.dev556/omdev.egg-info → omdev-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev556
+Version: 0.0.2
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -10,11 +10,11 @@ Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev556
+Requires-Dist: omlish==0.0.2
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev556 → omdev-0.0.2}/omdev/.omlish-manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 263,
+    "line": 322,
     "value": {
       "!.cli.types.CliModule": {
         "name": "cli",

{omdev-0.0.0.dev556 → omdev-0.0.2}/omdev/cli/clicli.py

@@ -90,6 +90,69 @@ class CliCli(ap.Cli):
 
     #
 
+    def _build_deps(
+            self,
+            *,
+            no_deps: bool = False,
+            extra_deps: ta.Sequence[str] | None = None,
+    ) -> ta.Sequence[str]:
+        dep_set: set[str] = set(extra_deps or [])
+        if not no_deps:
+            root_dists = get_root_dists()
+            dep_set.update(set(root_dists))
+        return sorted(dep_set - {install.DEFAULT_CLI_PKG})
+
+    @ap.cmd(name='deps')
+    def deps_cmd(self) -> None:
+        print('\n'.join(self._build_deps()))
+
+    #
+
+    def _build_recovery_command(
+            self,
+            target_version: str,
+            *,
+            url: str | None = None,
+            deps: ta.Sequence[str] | None = None,
+    ) -> str:
+        if url is None:
+            url = DEFAULT_REINSTALL_URL
+        if deps is None:
+            deps = self._build_deps()
+
+        parsed = urllib.parse.urlparse(url)
+        if parsed.scheme not in ('https', 'file'):
+            raise RuntimeError(f'Insecure url schem: {url}')
+
+        reco_cmd = ' '.join([
+            'curl -LsSf',
+            f"'{url}'" if (qu := shlex.quote(url)) == url else qu,
+            f'| python3 - --version {shlex.quote(target_version)}',
+            *deps,
+        ])
+
+        return reco_cmd
+
+    @ap.cmd(
+        ap.arg('--url', default=DEFAULT_REINSTALL_URL),
+        ap.arg('--no-deps', action='store_true'),
+        ap.arg('--version'),
+        ap.arg('extra_deps', nargs='*'),
+    )
+    def recovery(self) -> None:
+        reco_cmd = self._build_recovery_command(
+            self.args.version or __about__.__version__,
+            url=self.args.url,
+            deps=self._build_deps(
+                no_deps=self.args.no_deps,
+                extra_deps=self.args.extra_deps,
+            ),
+        )
+
+        print(reco_cmd)
+
+    #
+
     @dc.dataclass()
     class ReinstallWouldNotUpgradeError(Exception):
         current_version: str
@@ -136,11 +199,10 @@ class CliCli(ap.Cli):
 
         #
 
-        dep_set: set[str] = set(self.args.extra_deps or [])
-        if not self.args.no_deps:
-            root_dists = get_root_dists()
-            dep_set.update(set(root_dists))
-        deps = sorted(dep_set - {install.DEFAULT_CLI_PKG})  # noqa
+        deps = self._build_deps(
+            no_deps=self.args.no_deps,
+            extra_deps=self.args.extra_deps,
+        )
 
         #
 
@@ -233,16 +295,13 @@ class CliCli(ap.Cli):
 
         else:
             url = self.args.url
-            parsed = urllib.parse.urlparse(url)
-            if parsed.scheme not in ('https', 'file'):
-                raise RuntimeError(f'Insecure url schem: {url}')
-
-            reco_cmd = ' '.join([
-                'curl -LsSf',
-                f"'{url}'" if (qu := shlex.quote(url)) == url else qu,
-                f'| python3 - --version {shlex.quote(target_version)}',
-                *deps,
-            ])
+
+            reco_cmd = self._build_recovery_command(
+                target_version,
+                url=url,
+                deps=deps,
+            )
+
             print(f'Recovery command:\n\n{reco_cmd}\n')
 
             with urllib.request.urlopen(urllib.request.Request(url)) as resp:  # noqa

{omdev-0.0.0.dev556 → omdev-0.0.2}/omdev/cli/install.py

@@ -20,7 +20,7 @@ import typing as ta
 
 
 DEFAULT_CLI_PKG = 'omdev-cli'
-DEFAULT_PY_VER = '3.13'
+DEFAULT_PY_VER = '3.14'
 
 
 @dc.dataclass(frozen=True)
@@ -85,7 +85,6 @@ class UvxInstallManager(InstallManager):
             'uv', 'tool',
             'install',
             '--refresh',
-            '--prerelease=allow',
             f'--python={opts.py_ver}',
             _format_install_cli_pkg(opts),
             *itertools.chain.from_iterable(['--with', e] for e in (opts.extras or [])),

omdev-0.0.2/omdev/dockerdev/resources/.python-versions.json

@@ -0,0 +1,19 @@
+{
+  "8": "3.8.20",
+  "9": "3.9.25",
+  "10": "3.10.19",
+  "11": "3.11.14",
+  "12": "3.12.12",
+  "13": "3.13.13",
+  "13d": "3.13.13d",
+  "13t": "3.13.13t",
+  "13dt": "3.13.13dt",
+  "14": "3.14.4",
+  "14d": "3.14.4d",
+  "14t": "3.14.4t",
+  "14dt": "3.14.4dt",
+  "15": "3.15.0a8",
+  "15d": "3.15.0a8d",
+  "15t": "3.15.0a8t",
+  "15dt": "3.15.0a8dt"
+}

omdev-0.0.2/omdev/dockerdev/resources/configs/.sqliterc

@@ -0,0 +1,4 @@
+.headers on
+.mode line
+.timer on
+.changes on

{omdev-0.0.0.dev556 → omdev-0.0.2}/omdev/dockerdev/resources/depsets/system.toml

@@ -69,6 +69,7 @@ deps = [
   'libgdbm6',
   'libpq-dev',
   'postgresql-client',
+  'sqlite3',
 
   # terminal UX & interactive tools
   'btop',

{omdev-0.0.0.dev556 → omdev-0.0.2}/omdev/py/docstrings/attrdoc.py

@@ -33,7 +33,7 @@ def ast_unparse(node: ast.AST) -> str | None:
     if hasattr(ast, 'unparse'):
         return ast.unparse(node)
     # Support simple cases in Python < 3.9
-    if isinstance(node, (ast.Num, ast.NameConstant, ast.Constant)):
+    if isinstance(node, ast.Constant):
         return str(ast_get_constant_value(node))
     if isinstance(node, ast.Name):
         return node.id

{omdev-0.0.0.dev556 → omdev-0.0.2}/omdev/py/scripts/bumpversion.py

@@ -32,9 +32,14 @@ def _main() -> None:
             continue
         parts = m.groupdict()['version'].split('.')
         rp = parts[-1]
-        ni = [i for i in range(len(rp)) if rp[i] not in string.digits][-1] + 1
-        tp, np = rp[:ni], rp[ni:]
-        n = int(np)
+        try:
+            n = int(rp)
+        except ValueError:
+            ni = [i for i in range(len(rp)) if rp[i] not in string.digits][-1] + 1
+            tp, np = rp[:ni], rp[ni:]
+            n = int(np)
+        else:
+            tp = ''
         nv = '.'.join([*parts[:-1], tp + str(n + 1)])
         lines[i] = f"__version__ = '{nv}'\n"
     new_src = ''.join(lines)

{omdev-0.0.0.dev556 → omdev-0.0.2}/omdev/py/tools/pipdepup.py

@@ -605,7 +605,7 @@ def _tabulate(
 
     rows = [tuple(map(str, row)) for row in rows]
     sizes = [max(map(len, col)) for col in itertools.zip_longest(*rows, fillvalue='')]
-    table = [sep.join(map(str.ljust, row, sizes)).rstrip() for row in rows]
+    table = [sep.join(map(str.ljust, row, sizes, strict=True)).rstrip() for row in rows]
     return table, sizes
 
 

{omdev-0.0.0.dev556 → omdev-0.0.2}/omdev/scripts/ci.py

@@ -216,7 +216,7 @@ def __omlish_amalg__():  # noqa
             dict(path='docker/cmds.py', sha1='5528c384f68f9003732bfaf6be302e84747909dd'),
             dict(path='utils.py', sha1='b7b7b439b1077771f2bd7c7c74ed422ea2663014'),
             dict(path='../../omlish/http/pipelines/decoders.py', sha1='836ddfc508c494a6fd15c2b597c50aecddcf5a04'),
-            dict(path='../../omlish/io/pipelines/drivers/sync.py', sha1='7597bdd0218cf975efc1adaa8ab3f0ab6f5e5590'),
+            dict(path='../../omlish/io/pipelines/drivers/sync.py', sha1='d347a55dcd578f82dc9a55c589abf6195725755a'),
             dict(path='../../omlish/lite/timing.py', sha1='af5022f5a508939f1b433ed0514ede340fd0d672'),
             dict(path='compose.py', sha1='d2bec1385701979c7ff9913456b72d8c7b31f70b'),
             dict(path='docker/cache.py', sha1='07a9e3d00bdd60f1a0a9b55aca12430fa1b4e3d9'),
@@ -30797,7 +30797,7 @@ class SyncSocketIoPipelineDriver:
     def enqueue(self, *in_msgs: ta.Any) -> None:
         self._input_q.extend(in_msgs)
 
-    def poll(self) -> ta.Union[
+    def _poll(self) -> ta.Union[
         ta.Tuple[ta.Literal['unhandled'], ta.Any],
         ta.Literal['read', 'stop'],
         None,
@@ -30840,7 +30840,7 @@ class SyncSocketIoPipelineDriver:
         check.state(pipeline.is_ready)
 
         while True:
-            out = self.poll()
+            out = self._poll()
 
             if isinstance(out, tuple):
                 ok, ov = out

{omdev-0.0.0.dev556 → omdev-0.0.2}/omdev/scripts/lib/io/pipelines.py

@@ -72,7 +72,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../logs/std/loggers.py', sha1='dbdfc66188e6accb75d03454e43221d3fba0f011'),
             dict(path='bytes/decoders.py', sha1='6f6d8bc1adc6a5277543389814bc26ef63e34561'),
             dict(path='../../logs/modules.py', sha1='dd7d5f8e63fe8829dfb49460f3929ab64b68ee14'),
-            dict(path='drivers/asyncio.py', sha1='7690f08b43417471436b444737d8d24e3ea67d03'),
+            dict(path='drivers/asyncio.py', sha1='d7303a66eabe5dfdfb2df30d2f8b5291a7d5695c'),
             dict(path='_amalg.py', sha1='14b67747b1e3b3c1483050a7948a29888d732ed9'),
         ],
     )
@@ -8165,6 +8165,8 @@ class AsyncioStreamIoPipelineDriver(Abstract):
     ##
     # init
 
+    _has_init = False
+
     _sched: 'AsyncioStreamIoPipelineDriver._SchedulingService'
 
     _pipeline: IoPipeline
@@ -8175,6 +8177,9 @@ class AsyncioStreamIoPipelineDriver(Abstract):
     _output_handlers: ta.Mapping[type, ta.Callable[[ta.Any], ta.Awaitable[None]]]
 
     async def _init(self) -> None:
+        check.state(not self._has_init)
+        self._has_init = True
+
         self._sched = self._SchedulingService(self)
 
         services = IoPipelineServices.of(self._spec.services)
@@ -8401,9 +8406,40 @@ class AsyncioStreamIoPipelineDriver(Abstract):
         if not self._has_read_eof and (self._want_read or self._is_auto_read()):
             self._ensure_read_task()
 
-    @abc.abstractmethod
+    _read_task: ta.Optional[asyncio.Task] = None
+
     def _ensure_read_task(self) -> None:
-        raise NotImplementedError
+        if self._read_task is not None or self._shutdown_event.is_set():
+            return
+
+        self._read_task = asyncio.create_task(self._reader.read(self._config.read_chunk_size))
+
+        def _done(task: 'asyncio.Task[bytes]') -> None:
+            check.state(task is self._read_task)
+            self._read_task = None
+
+            if self._shutdown_event.is_set():
+                return
+
+            cmd: AsyncioStreamIoPipelineDriver._Command
+            eof = False
+            try:
+                data = task.result()
+
+            except asyncio.CancelledError:
+                cmd = AsyncioStreamIoPipelineDriver._ReadCancelledCommand()  # noqa
+
+            else:
+                cmd = AsyncioStreamIoPipelineDriver._ReadCompletedCommand(data)  # noqa
+                eof = not data
+
+            self._command_queue.put_nowait(cmd)
+
+            # FIXME: disable? toggle? this pre-reads till told to stop to try to reduce stalling
+            if not eof:
+                self._maybe_ensure_read_task()
+
+        self._read_task.add_done_callback(_done)
 
     ##
     # scheduling
@@ -8586,78 +8622,11 @@ class AsyncioStreamIoPipelineDriver(Abstract):
     async def _shutdown_task_main(self) -> None:
         await self._shutdown_event.wait()
 
-    ##
-    # main loop
-
-    @abc.abstractmethod
-    def _run(self) -> ta.Awaitable[None]:
-        raise NotImplementedError
-
-    @async_exception_logging(alog)
-    async def run(self) -> None:
-        try:
-            self._shutdown_task  # noqa
-        except AttributeError:
-            pass
-        else:
-            raise RuntimeError('Already running')
-
-        await self._init()
-
-        self._shutdown_task = asyncio.create_task(self._shutdown_task_main())
-
-        try:
-            try:
-                await self._run()
-
-            finally:
-                self._pipeline.destroy()
-
-        finally:
-            await self._cancel_tasks(self._shutdown_task, check_running=True)
-
 
 ##
 
 
-class SimpleAsyncioStreamIoPipelineDriver(AsyncioStreamIoPipelineDriver):
-    _read_task: ta.Optional[asyncio.Task] = None
-
-    def _ensure_read_task(self) -> None:
-        if self._read_task is not None or self._shutdown_event.is_set():
-            return
-
-        self._read_task = asyncio.create_task(self._reader.read(self._config.read_chunk_size))
-
-        def _done(task: 'asyncio.Task[bytes]') -> None:
-            check.state(task is self._read_task)
-            self._read_task = None
-
-            if self._shutdown_event.is_set():
-                return
-
-            cmd: AsyncioStreamIoPipelineDriver._Command
-            eof = False
-            try:
-                data = task.result()
-
-            except asyncio.CancelledError:
-                cmd = AsyncioStreamIoPipelineDriver._ReadCancelledCommand()  # noqa
-
-            else:
-                cmd = AsyncioStreamIoPipelineDriver._ReadCompletedCommand(data)  # noqa
-                eof = not data
-
-            self._command_queue.put_nowait(cmd)
-
-            # FIXME: disable? toggle? this pre-reads till told to stop to try to reduce stalling
-            if not eof:
-                self._maybe_ensure_read_task()
-
-        self._read_task.add_done_callback(_done)
-
-    #
-
+class LoopAsyncioStreamIoPipelineDriver(AsyncioStreamIoPipelineDriver):
     async def _run(self) -> None:
         self._maybe_ensure_read_task()
 
@@ -8705,6 +8674,29 @@ class SimpleAsyncioStreamIoPipelineDriver(AsyncioStreamIoPipelineDriver):
                 check_running=True,
             )
 
+    @async_exception_logging(alog)
+    async def run(self) -> None:
+        try:
+            self._shutdown_task  # noqa
+        except AttributeError:
+            pass
+        else:
+            raise RuntimeError('Already running')
+
+        await self._init()
+
+        self._shutdown_task = asyncio.create_task(self._shutdown_task_main())
+
+        try:
+            try:
+                await self._run()
+
+            finally:
+                self._pipeline.destroy()
+
+        finally:
+            await self._cancel_tasks(self._shutdown_task, check_running=True)
+
 
 ########################################
 # _amalg.py

{omdev-0.0.0.dev556 → omdev-0.0.2/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev556
+Version: 0.0.2
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -10,11 +10,11 @@ Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev556
+Requires-Dist: omlish==0.0.2
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev556 → omdev-0.0.2}/omdev.egg-info/SOURCES.txt

@@ -174,6 +174,7 @@ omdev/dockerdev/ops.py
 omdev/dockerdev/rendering.py
 omdev/dockerdev/resources/.python-versions.json
 omdev/dockerdev/resources/configs/.gdbinit
+omdev/dockerdev/resources/configs/.sqliterc
 omdev/dockerdev/resources/configs/.tmux.conf
 omdev/dockerdev/resources/configs/.vimrc
 omdev/dockerdev/resources/depsets/python.toml

{omdev-0.0.0.dev556 → omdev-0.0.2}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev556
+omlish==0.0.2
 
 [all]
 black~=26.3

{omdev-0.0.0.dev556 → omdev-0.0.2}/pyproject.toml

@@ -12,19 +12,19 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
-requires-python = '>=3.13'
-version = '0.0.0.dev556'
+requires-python = '>=3.14'
+version = '0.0.2'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
     'Operating System :: OS Independent',
     'Operating System :: POSIX',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.13',
+    'Programming Language :: Python :: 3.14',
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev556',
+    'omlish == 0.0.2',
 ]
 
 [project.optional-dependencies]

omdev-0.0.0.dev556/omdev/dockerdev/resources/.python-versions.json

@@ -1,17 +0,0 @@
-{
-  "8": "3.8.20",
-  "9": "3.9.25",
-  "10": "3.10.19",
-  "11": "3.11.14",
-  "12": "3.12.12",
-  "13": "3.13.12",
-  "13d": "3.13.12d",
-  "13t": "3.13.12t",
-  "13dt": "3.13.12dt",
-  "14": "3.14.3",
-  "14d": "3.14.3d",
-  "14t": "3.14.3t",
-  "14dt": "3.14.3dt",
-  "15": "3.15.0a7",
-  "15t": "3.15.0a7t"
-}