omdev 0.0.0.dev144__tar.gz → 0.0.0.dev146__tar.gz

{omdev-0.0.0.dev144/omdev.egg-info → omdev-0.0.0.dev146}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev144
+Version: 0.0.0.dev146
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev144
+Requires-Dist: omlish==0.0.0.dev146
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146}/omdev/.manifests.json

@@ -243,7 +243,7 @@
     "module": ".tools.docker",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/docker.py",
-    "line": 236,
+    "line": 249,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "docker",
@@ -255,7 +255,7 @@
     "module": ".tools.git",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/git.py",
-    "line": 211,
+    "line": 215,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "git",

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146}/omdev/amalg/amalg.py

@@ -25,8 +25,10 @@ Targets:
 """
 import argparse
 import ast
+import base64
 import dataclasses as dc
 import io
+import itertools
 import logging
 import os.path
 import re
@@ -286,6 +288,37 @@ def is_root_level_if_type_checking_block(lts: Tokens) -> bool:
 ##
 
 
+class RootLevelResourcesRead(ta.NamedTuple):
+    variable: str
+    kind: ta.Literal['binary', 'text']
+    resource: str
+
+
+def is_root_level_resources_read(lts: Tokens) -> RootLevelResourcesRead | None:
+    wts = list(tks.ignore_ws(lts, keep=['INDENT']))
+
+    if not tks.match_toks(wts, [
+        ('NAME', None),
+        ('OP', '='),
+        ('NAME', ('read_package_resource_binary', 'read_package_resource_text')),
+        ('OP', '('),
+        ('NAME', '__package__'),
+        ('OP', ','),
+        ('STRING', None),
+        ('OP', ')'),
+    ]):
+        return None
+
+    return RootLevelResourcesRead(
+        wts[0].src,
+        'binary' if wts[2].src == 'read_package_resource_binary' else 'text',
+        ast.literal_eval(wts[6].src),
+    )
+
+
+##
+
+
 @dc.dataclass(frozen=True, kw_only=True)
 class SrcFile:
     path: str
@@ -301,6 +334,8 @@ class SrcFile:
 
     ruff_noqa: ta.AbstractSet[str] = dc.field(repr=False)
 
+    has_binary_resources: bool = False
+
 
 def make_src_file(
         path: str,
@@ -322,6 +357,8 @@ def make_src_file(
     tys: list[Typing] = []
     ctls: list[Tokens] = []
 
+    has_binary_resources = False
+
     i = 0
     while i < len(cls):
         line = cls[i]
@@ -383,6 +420,57 @@ def make_src_file(
                 i += 1
                 skip_block()
 
+        elif (rsrc := is_root_level_resources_read(line)) is not None:
+            rf = os.path.join(os.path.dirname(path), rsrc.resource)
+
+            if rsrc.kind == 'binary':
+                with open(rf, 'rb') as bf:
+                    rb = bf.read()  # noqa
+
+                ctls.append([
+                    trt.Token(name='NAME', src=rsrc.variable),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='OP', src='='),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='NAME', src='base64'),
+                    trt.Token(name='OP', src='.'),
+                    trt.Token(name='NAME', src='b64decode'),
+                    trt.Token(name='OP', src='('),
+                    trt.Token(name='NL', src='\n'),
+                ])
+
+                rb64 = base64.b64encode(rb).decode('ascii')
+                for chunk in itertools.batched(rb64, 96):
+                    ctls.append([
+                        trt.Token(name='UNIMPORTANT_WS', src='    '),
+                        trt.Token(name='STRING', src=f"'{''.join(chunk)}'"),
+                        trt.Token(name='NL', src='\n'),
+                    ])
+
+                ctls.append([
+                    trt.Token(name='OP', src=')'),
+                    trt.Token(name='NEWLINE', src='\n'),
+                ])
+
+                has_binary_resources = True
+
+            elif rsrc.kind == 'text':
+                with open(rf) as tf:
+                    rt = tf.read()  # noqa
+                rt = rt.replace('\\', '\\\\')  # Escape backslashes
+                rt = rt.replace('"""', r'\"\"\"')
+                ctls.append([
+                    trt.Token(name='NAME', src=rsrc.variable),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='OP', src='='),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='STRING', src=f'"""\\\n{rt}"""\n'),
+                    trt.Token(name='NEWLINE', src=''),
+                ])
+
+            else:
+                raise ValueError(rsrc.kind)
+
         else:
             ctls.append(line)
 
@@ -399,6 +487,8 @@ def make_src_file(
         content_lines=ctls,
 
         ruff_noqa=set(lang.flatten(tks.join_toks(l).strip().split()[3:] for l in rnls)),  # noqa
+
+        has_binary_resources=has_binary_resources,
     )
 
 
@@ -488,6 +578,8 @@ def gen_amalg(
     dct: dict = {
         ('sys', None, None): ['import sys\n'],
     }
+    if any(sf.has_binary_resources for sf in src_files.values()):
+        dct[('base64', None, None)] = ['import base64\n']
     for imp in gl_imps:
         dct.setdefault((imp.mod, imp.item, imp.as_), []).append(imp)
     for _, l in sorted(dct.items()):

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146}/omdev/cli/main.py

@@ -13,8 +13,8 @@ import typing as ta
 
 from omlish import check
 from omlish.lite.cached import cached_nullary
+from omlish.manifests.load import ManifestLoader
 
-from ..manifests.load import ManifestLoader
 from .types import CliCmd
 from .types import CliFunc
 from .types import CliModule

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146}/omdev/interp/resolvers.py

@@ -35,7 +35,7 @@ class InterpResolver:
             if spec.contains(si)
         ]
 
-        slst = sorted(lst, key=lambda t: (-t[0], t[1]))
+        slst = sorted(lst, key=lambda t: (-t[0], t[1].version))
         if not slst:
             return None
 

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146}/omdev/manifests/build.py

@@ -1,3 +1,4 @@
+# ruff: noqa: UP006 UP007
 """
 TODO:
  - separate build from cli
@@ -10,7 +11,6 @@ See (entry_points):
  - https://packaging.python.org/en/latest/guides/creating-and-discovering-plugins/
  - [project.entry-points.omlish-manifests] \n omdev = omdev
 """
-# ruff: noqa: UP006 UP007
 import argparse
 import asyncio
 import collections
@@ -31,11 +31,11 @@ from omlish.lite.cached import cached_nullary
 from omlish.lite.json import json_dumps_pretty
 from omlish.lite.logs import configure_standard_logging
 from omlish.lite.logs import log
+from omlish.manifests.load import ManifestLoader
+from omlish.manifests.types import Manifest
+from omlish.manifests.types import ManifestOrigin
 
 from .. import magic
-from .load import ManifestLoader
-from .types import Manifest
-from .types import ManifestOrigin
 
 
 T = ta.TypeVar('T')

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146}/omdev/precheck/manifests.py

@@ -1,7 +1,8 @@
 import dataclasses as dc
 import typing as ta
 
-from ..manifests.load import ManifestLoader
+from omlish.manifests.load import ManifestLoader
+
 from .base import Precheck
 from .base import PrecheckContext
 

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146}/omdev/scripts/interp.py

@@ -2530,7 +2530,7 @@ class InterpResolver:
             if spec.contains(si)
         ]
 
-        slst = sorted(lst, key=lambda t: (-t[0], t[1]))
+        slst = sorted(lst, key=lambda t: (-t[0], t[1].version))
         if not slst:
             return None
 

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146}/omdev/scripts/pyproject.py

@@ -3087,23 +3087,24 @@ TODO:
 @dc.dataclass(frozen=True)
 class ObjMarshalOptions:
     raw_bytes: bool = False
+    nonstrict_dataclasses: bool = False
 
 
 class ObjMarshaler(abc.ABC):
     @abc.abstractmethod
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         raise NotImplementedError
 
     @abc.abstractmethod
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         raise NotImplementedError
 
 
 class NopObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o
 
 
@@ -3111,29 +3112,29 @@ class NopObjMarshaler(ObjMarshaler):
 class ProxyObjMarshaler(ObjMarshaler):
     m: ta.Optional[ObjMarshaler] = None
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return check_not_none(self.m).marshal(o, opts)
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return check_not_none(self.m).marshal(o, ctx)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return check_not_none(self.m).unmarshal(o, opts)
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return check_not_none(self.m).unmarshal(o, ctx)
 
 
 @dc.dataclass(frozen=True)
 class CastObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return self.ty(o)
 
 
 class DynamicObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return marshal_obj(o)
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return ctx.manager.marshal_obj(o, opts=ctx.options)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o
 
 
@@ -3141,10 +3142,10 @@ class DynamicObjMarshaler(ObjMarshaler):
 class Base64ObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return base64.b64encode(o).decode('ascii')
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return self.ty(base64.b64decode(o))
 
 
@@ -3152,25 +3153,25 @@ class Base64ObjMarshaler(ObjMarshaler):
 class BytesSwitchedObjMarshaler(ObjMarshaler):
     m: ObjMarshaler
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        if opts.raw_bytes:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if ctx.options.raw_bytes:
             return o
-        return self.m.marshal(o, opts)
+        return self.m.marshal(o, ctx)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        if opts.raw_bytes:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if ctx.options.raw_bytes:
             return o
-        return self.m.unmarshal(o, opts)
+        return self.m.unmarshal(o, ctx)
 
 
 @dc.dataclass(frozen=True)
 class EnumObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o.name
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return self.ty.__members__[o]  # type: ignore
 
 
@@ -3178,15 +3179,15 @@ class EnumObjMarshaler(ObjMarshaler):
 class OptionalObjMarshaler(ObjMarshaler):
     item: ObjMarshaler
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         if o is None:
             return None
-        return self.item.marshal(o, opts)
+        return self.item.marshal(o, ctx)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         if o is None:
             return None
-        return self.item.unmarshal(o, opts)
+        return self.item.unmarshal(o, ctx)
 
 
 @dc.dataclass(frozen=True)
@@ -3195,11 +3196,11 @@ class MappingObjMarshaler(ObjMarshaler):
     km: ObjMarshaler
     vm: ObjMarshaler
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return {self.km.marshal(k, opts): self.vm.marshal(v, opts) for k, v in o.items()}
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return {self.km.marshal(k, ctx): self.vm.marshal(v, ctx) for k, v in o.items()}
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return self.ty((self.km.unmarshal(k, opts), self.vm.unmarshal(v, opts)) for k, v in o.items())
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return self.ty((self.km.unmarshal(k, ctx), self.vm.unmarshal(v, ctx)) for k, v in o.items())
 
 
 @dc.dataclass(frozen=True)
@@ -3207,11 +3208,11 @@ class IterableObjMarshaler(ObjMarshaler):
     ty: type
     item: ObjMarshaler
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return [self.item.marshal(e, opts) for e in o]
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return [self.item.marshal(e, ctx) for e in o]
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return self.ty(self.item.unmarshal(e, opts) for e in o)
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return self.ty(self.item.unmarshal(e, ctx) for e in o)
 
 
 @dc.dataclass(frozen=True)
@@ -3220,11 +3221,18 @@ class DataclassObjMarshaler(ObjMarshaler):
     fs: ta.Mapping[str, ObjMarshaler]
     nonstrict: bool = False
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return {k: m.marshal(getattr(o, k), opts) for k, m in self.fs.items()}
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return {
+            k: m.marshal(getattr(o, k), ctx)
+            for k, m in self.fs.items()
+        }
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return self.ty(**{k: self.fs[k].unmarshal(v, opts) for k, v in o.items() if not self.nonstrict or k in self.fs})
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return self.ty(**{
+            k: self.fs[k].unmarshal(v, ctx)
+            for k, v in o.items()
+            if not (self.nonstrict or ctx.options.nonstrict_dataclasses) or k in self.fs
+        })
 
 
 @dc.dataclass(frozen=True)
@@ -3244,50 +3252,50 @@ class PolymorphicObjMarshaler(ObjMarshaler):
             {i.tag: i for i in impls},
         )
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         impl = self.impls_by_ty[type(o)]
-        return {impl.tag: impl.m.marshal(o, opts)}
+        return {impl.tag: impl.m.marshal(o, ctx)}
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         [(t, v)] = o.items()
         impl = self.impls_by_tag[t]
-        return impl.m.unmarshal(v, opts)
+        return impl.m.unmarshal(v, ctx)
 
 
 @dc.dataclass(frozen=True)
 class DatetimeObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o.isoformat()
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return self.ty.fromisoformat(o)  # type: ignore
 
 
 class DecimalObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return str(check_isinstance(o, decimal.Decimal))
 
-    def unmarshal(self, v: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, v: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return decimal.Decimal(check_isinstance(v, str))
 
 
 class FractionObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         fr = check_isinstance(o, fractions.Fraction)
         return [fr.numerator, fr.denominator]
 
-    def unmarshal(self, v: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, v: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         num, denom = check_isinstance(v, list)
         return fractions.Fraction(num, denom)
 
 
 class UuidObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return str(o)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return uuid.UUID(o)
 
 
@@ -3448,6 +3456,12 @@ class ObjMarshalerManager:
 
     #
 
+    def _make_context(self, opts: ta.Optional[ObjMarshalOptions]) -> 'ObjMarshalContext':
+        return ObjMarshalContext(
+            options=opts or self._default_options,
+            manager=self,
+        )
+
     def marshal_obj(
             self,
             o: ta.Any,
@@ -3455,7 +3469,7 @@ class ObjMarshalerManager:
             opts: ta.Optional[ObjMarshalOptions] = None,
     ) -> ta.Any:
         m = self.get_obj_marshaler(ty if ty is not None else type(o))
-        return m.marshal(o, opts or self._default_options)
+        return m.marshal(o, self._make_context(opts))
 
     def unmarshal_obj(
             self,
@@ -3464,7 +3478,7 @@ class ObjMarshalerManager:
             opts: ta.Optional[ObjMarshalOptions] = None,
     ) -> T:
         m = self.get_obj_marshaler(ty)
-        return m.unmarshal(o, opts or self._default_options)
+        return m.unmarshal(o, self._make_context(opts))
 
     def roundtrip_obj(
             self,
@@ -3479,6 +3493,12 @@ class ObjMarshalerManager:
         return u
 
 
+@dc.dataclass(frozen=True)
+class ObjMarshalContext:
+    options: ObjMarshalOptions
+    manager: ObjMarshalerManager
+
+
 ##
 
 
@@ -5728,7 +5748,7 @@ class InterpResolver:
             if spec.contains(si)
         ]
 
-        slst = sorted(lst, key=lambda t: (-t[0], t[1]))
+        slst = sorted(lst, key=lambda t: (-t[0], t[1].version))
         if not slst:
             return None
 

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146}/omdev/tokens.py

@@ -61,7 +61,7 @@ def join_lines(ls: ta.Iterable[Tokens]) -> str:
 
 def match_toks(
         ts: ta.Iterable['trt.Token'],
-        pat: ta.Sequence[tuple[str | None, str | None]],
+        pat: ta.Sequence[tuple[str | None, str | tuple[str, ...] | None]],
 ) -> bool:
     it = iter(ts)
     for pn, ps in pat:
@@ -71,6 +71,13 @@ def match_toks(
             return False
         if pn is not None and t.name != pn:
             return False
-        if ps is not None and t.src != ps:
-            return False
+        if ps is not None:
+            if isinstance(ps, str):
+                if t.src != ps:
+                    return False
+            elif isinstance(ps, tuple):
+                if t.src not in ps:
+                    return False
+            else:
+                raise TypeError(ps)
     return True

omdev-0.0.0.dev146/omdev/toml/__init__.py

@@ -0,0 +1 @@
+# @omlish-lite

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146}/omdev/tools/docker.py

@@ -1,6 +1,6 @@
 """
 TODO:
- - check for updates
+ - https://github.com/zeromake/docker-debug
 """
 import os
 import re
@@ -232,6 +232,19 @@ class Cli(ap.Cli):
 
             print(f'{svc_name}: {lt}')
 
+    @ap.command()
+    def dockly(self) -> None:
+        os.execl(
+            exe := docker_exe(),
+            exe,
+            'run',
+            '-it',
+            '--rm',
+            '-v',
+            '/var/run/docker.sock:/var/run/docker.sock',
+            'lirantal/dockly',
+        )
+
 
 # @omlish-manifest
 _CLI_MODULE = CliModule('docker', __name__)

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146}/omdev/tools/git.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - https://github.com/vegardit/bash-funk/blob/main/docs/git.md
+"""
 import os
 import re
 import subprocess

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146}/omdev/tools/json/io.py

@@ -53,7 +53,7 @@
 #
 #
 # @dc.dataclass(frozen=True)
-# class FdIo(Input, Output):
+# class Fdio(Input, Output):
 #     fd: int
 #
 #     default_read_sz: int = DEFAULT_READ_SZ

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev144
+Version: 0.0.0.dev146
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev144
+Requires-Dist: omlish==0.0.0.dev146
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146}/omdev.egg-info/SOURCES.txt

@@ -96,8 +96,6 @@ omdev/magic/prepare.py
 omdev/magic/styles.py
 omdev/manifests/__init__.py
 omdev/manifests/build.py
-omdev/manifests/load.py
-omdev/manifests/types.py
 omdev/mypy/__init__.py
 omdev/mypy/debug.py
 omdev/packaging/__init__.py

{omdev-0.0.0.dev144 → omdev-0.0.0.dev146}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev144
+omlish==0.0.0.dev146
 
 [all]
 black~=24.10