omdev 0.0.0.dev526__tar.gz → 0.0.0.dev528__tar.gz

{omdev-0.0.0.dev526/omdev.egg-info → omdev-0.0.0.dev528}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev526
+Version: 0.0.0.dev528
 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.dev526
+Requires-Dist: omlish==0.0.0.dev528
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev526 → omdev-0.0.0.dev528}/omdev/amalg/cli/main.py

@@ -11,6 +11,7 @@ TODO:
  - more sanity checks lol
  - typealias - support # noqa, other comments, and lamely support multiline by just stealing lines till it parses
  - remove `if __name__ == '__main__':` blocks - thus, convention: no def _main() for these
+ - pyz! zipimport -> single `__main__.py` file + shebang
 
 See:
  - https://github.com/xonsh/amalgamate - mine is for portability not speed, and doesn't try to work on unmodified code

{omdev-0.0.0.dev526 → omdev-0.0.0.dev528}/omdev/amalg/gen/typing.py

@@ -30,6 +30,7 @@ def _is_typing(
         exclude_newtypes: bool = False,
 ) -> bool:
     es = tks.join_toks(lts).strip()
+    # FIXME: doesn't handle lines ending with `noqa` comments lol
     if es.endswith(NO_MOVE_COMMENT):
         return False
     if any(es.endswith(sfx) for sfx in (TYPE_ALIAS_COMMENT, NOQA_TYPE_ALIAS_COMMENT)):

{omdev-0.0.0.dev526 → omdev-0.0.0.dev528}/omdev/cc/cli.py

@@ -24,6 +24,9 @@ TODO:
  - cc ij, based off of cmake
  - fix CFLAGS/CCFLAGS/CPPFLAGS/CXXFLAGS
  - jit-gen cmake mode? multi-src builds
+ - alt exec modes (* share / dedupe with java cli *):
+   - fork/exec, just leave temp dir
+   - fork, set pr_deathsig, exec, forward signals
 """
 import os
 import shlex

{omdev-0.0.0.dev526 → omdev-0.0.0.dev528}/omdev/dataclasses/_dumping.py

@@ -38,7 +38,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='../../omlish/lite/check.py', sha1='0ce40cc68bd1b18604293a0b4924efabb6033766'),
+            dict(path='../../omlish/lite/check.py', sha1='4dee5d317d9e0fab5cd65f31a3cc1a496f7adfff'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
@@ -345,11 +345,11 @@ class Checks:
         return spec
 
     @ta.overload
-    def isinstance(self, v: ta.Any, spec: ta.Type[T], msg: CheckMessage = None) -> T:
+    def isinstance(self, v: ta.Any, spec: ta.Type[T], msg: CheckMessage = None, /) -> T:
         ...
 
     @ta.overload
-    def isinstance(self, v: ta.Any, spec: ta.Any, msg: CheckMessage = None) -> ta.Any:
+    def isinstance(self, v: ta.Any, spec: ta.Any, msg: CheckMessage = None, /) -> ta.Any:
         ...
 
     def isinstance(self, v, spec, msg=None):
@@ -365,14 +365,14 @@ class Checks:
         return v
 
     @ta.overload
-    def of_isinstance(self, spec: ta.Type[T], msg: CheckMessage = None) -> ta.Callable[[ta.Any], T]:
+    def of_isinstance(self, spec: ta.Type[T], msg: CheckMessage = None, /) -> ta.Callable[[ta.Any], T]:
         ...
 
     @ta.overload
-    def of_isinstance(self, spec: ta.Any, msg: CheckMessage = None) -> ta.Callable[[ta.Any], ta.Any]:
+    def of_isinstance(self, spec: ta.Any, msg: CheckMessage = None, /) -> ta.Callable[[ta.Any], ta.Any]:
         ...
 
-    def of_isinstance(self, spec, msg=None):
+    def of_isinstance(self, spec, msg=None, /):
         spec = self._unpack_isinstance_spec(spec)
 
         def inner(v):
@@ -380,7 +380,7 @@ class Checks:
 
         return inner
 
-    def cast(self, v: ta.Any, cls: ta.Type[T], msg: CheckMessage = None) -> T:
+    def cast(self, v: ta.Any, cls: ta.Type[T], msg: CheckMessage = None, /) -> T:
         if not isinstance(v, cls):
             self._raise(
                 TypeError,
@@ -391,13 +391,13 @@ class Checks:
 
         return v
 
-    def of_cast(self, cls: ta.Type[T], msg: CheckMessage = None) -> ta.Callable[[T], T]:
+    def of_cast(self, cls: ta.Type[T], msg: CheckMessage = None, /) -> ta.Callable[[T], T]:
         def inner(v):
             return self.cast(v, cls, msg)
 
         return inner
 
-    def not_isinstance(self, v: T, spec: ta.Any, msg: CheckMessage = None) -> T:  # noqa
+    def not_isinstance(self, v: T, spec: ta.Any, msg: CheckMessage = None, /) -> T:  # noqa
         if isinstance(v, self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
@@ -409,7 +409,7 @@ class Checks:
 
         return v
 
-    def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None) -> ta.Callable[[T], T]:
+    def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None, /) -> ta.Callable[[T], T]:
         spec = self._unpack_isinstance_spec(spec)
 
         def inner(v):
@@ -419,7 +419,7 @@ class Checks:
 
     ##
 
-    def issubclass(self, v: ta.Type[T], spec: ta.Any, msg: CheckMessage = None) -> ta.Type[T]:  # noqa
+    def issubclass(self, v: ta.Type[T], spec: ta.Any, msg: CheckMessage = None, /) -> ta.Type[T]:  # noqa
         if not issubclass(v, spec):
             self._raise(
                 TypeError,
@@ -431,7 +431,7 @@ class Checks:
 
         return v
 
-    def not_issubclass(self, v: ta.Type[T], spec: ta.Any, msg: CheckMessage = None) -> ta.Type[T]:
+    def not_issubclass(self, v: ta.Type[T], spec: ta.Any, msg: CheckMessage = None, /) -> ta.Type[T]:
         if issubclass(v, spec):
             self._raise(
                 TypeError,
@@ -443,7 +443,7 @@ class Checks:
 
         return v
 
-    def not_issubclass_except_nameerror(self, v: ta.Type[T], spec: ta.Callable[[], type], msg: CheckMessage = None) -> ta.Type[T]:  # noqa
+    def not_issubclass_except_nameerror(self, v: ta.Type[T], spec: ta.Callable[[], type], msg: CheckMessage = None, /) -> ta.Type[T]:  # noqa
         try:
             c = spec()
         except NameError:
@@ -462,7 +462,7 @@ class Checks:
 
     #
 
-    def in_(self, v: T, c: ta.Container[T], msg: CheckMessage = None) -> T:
+    def in_(self, v: T, c: ta.Container[T], msg: CheckMessage = None, /) -> T:
         if v not in c:
             self._raise(
                 ValueError,
@@ -474,7 +474,7 @@ class Checks:
 
         return v
 
-    def not_in(self, v: T, c: ta.Container[T], msg: CheckMessage = None) -> T:
+    def not_in(self, v: T, c: ta.Container[T], msg: CheckMessage = None, /) -> T:
         if v in c:
             self._raise(
                 ValueError,
@@ -486,7 +486,7 @@ class Checks:
 
         return v
 
-    def empty(self, v: SizedT, msg: CheckMessage = None) -> SizedT:
+    def empty(self, v: SizedT, msg: CheckMessage = None, /) -> SizedT:
         if len(v) != 0:
             self._raise(
                 ValueError,
@@ -498,7 +498,7 @@ class Checks:
 
         return v
 
-    def iterempty(self, v: ta.Iterable[T], msg: CheckMessage = None) -> ta.Iterable[T]:
+    def iterempty(self, v: ta.Iterable[T], msg: CheckMessage = None, /) -> ta.Iterable[T]:
         it = iter(v)
         try:
             next(it)
@@ -515,7 +515,7 @@ class Checks:
 
         return v
 
-    def not_empty(self, v: SizedT, msg: CheckMessage = None) -> SizedT:
+    def not_empty(self, v: SizedT, msg: CheckMessage = None, /) -> SizedT:
         if len(v) == 0:
             self._raise(
                 ValueError,
@@ -527,7 +527,7 @@ class Checks:
 
         return v
 
-    def unique(self, it: ta.Iterable[T], msg: CheckMessage = None) -> ta.Iterable[T]:
+    def unique(self, it: ta.Iterable[T], msg: CheckMessage = None, /) -> ta.Iterable[T]:
         dupes = [e for e, c in collections.Counter(it).items() if c > 1]
         if dupes:
             self._raise(
@@ -539,7 +539,7 @@ class Checks:
 
         return it
 
-    def single(self, obj: ta.Iterable[T], msg: CheckMessage = None) -> T:
+    def single(self, obj: ta.Iterable[T], msg: CheckMessage = None, /) -> T:
         try:
             [value] = obj
         except ValueError:
@@ -553,7 +553,7 @@ class Checks:
 
         return value
 
-    def opt_single(self, obj: ta.Iterable[T], msg: CheckMessage = None) -> ta.Optional[T]:
+    def opt_single(self, obj: ta.Iterable[T], msg: CheckMessage = None, /) -> ta.Optional[T]:
         it = iter(obj)
         try:
             value = next(it)
@@ -575,7 +575,7 @@ class Checks:
 
         raise RuntimeError  # noqa
 
-    async def async_single(self, obj: ta.AsyncIterable[T], msg: CheckMessage = None) -> T:
+    async def async_single(self, obj: ta.AsyncIterable[T], msg: CheckMessage = None, /) -> T:
         ait = obj.__aiter__()
 
         try:
@@ -604,7 +604,7 @@ class Checks:
 
         raise RuntimeError  # noqa
 
-    async def async_opt_single(self, obj: ta.AsyncIterable[T], msg: CheckMessage = None) -> ta.Optional[T]:
+    async def async_opt_single(self, obj: ta.AsyncIterable[T], msg: CheckMessage = None, /) -> ta.Optional[T]:
         ait = obj.__aiter__()
 
         try:
@@ -634,7 +634,7 @@ class Checks:
 
     #
 
-    def none(self, v: ta.Any, msg: CheckMessage = None) -> None:
+    def none(self, v: ta.Any, msg: CheckMessage = None, /) -> None:
         if v is not None:
             self._raise(
                 ValueError,
@@ -644,7 +644,7 @@ class Checks:
                 render_fmt='%s',
             )
 
-    def not_none(self, v: ta.Optional[T], msg: CheckMessage = None) -> T:
+    def not_none(self, v: ta.Optional[T], msg: CheckMessage = None, /) -> T:
         if v is None:
             self._raise(
                 ValueError,
@@ -658,7 +658,7 @@ class Checks:
 
     #
 
-    def equal(self, v: T, o: ta.Any, msg: CheckMessage = None) -> T:
+    def equal(self, v: T, o: ta.Any, msg: CheckMessage = None, /) -> T:
         if o != v:
             self._raise(
                 ValueError,
@@ -670,7 +670,7 @@ class Checks:
 
         return v
 
-    def not_equal(self, v: T, o: ta.Any, msg: CheckMessage = None) -> T:
+    def not_equal(self, v: T, o: ta.Any, msg: CheckMessage = None, /) -> T:
         if o == v:
             self._raise(
                 ValueError,
@@ -682,7 +682,7 @@ class Checks:
 
         return v
 
-    def is_(self, v: T, o: ta.Any, msg: CheckMessage = None) -> T:
+    def is_(self, v: T, o: ta.Any, msg: CheckMessage = None, /) -> T:
         if o is not v:
             self._raise(
                 ValueError,
@@ -694,7 +694,7 @@ class Checks:
 
         return v
 
-    def is_not(self, v: T, o: ta.Any, msg: CheckMessage = None) -> T:
+    def is_not(self, v: T, o: ta.Any, msg: CheckMessage = None, /) -> T:
         if o is v:
             self._raise(
                 ValueError,
@@ -706,7 +706,7 @@ class Checks:
 
         return v
 
-    def callable(self, v: T, msg: CheckMessage = None) -> T:  # noqa
+    def callable(self, v: T, msg: CheckMessage = None, /) -> T:  # noqa
         if not callable(v):
             self._raise(
                 TypeError,
@@ -718,7 +718,7 @@ class Checks:
 
         return v
 
-    def non_empty_str(self, v: ta.Optional[str], msg: CheckMessage = None) -> str:
+    def non_empty_str(self, v: ta.Optional[str], msg: CheckMessage = None, /) -> str:
         if not isinstance(v, str) or not v:
             self._raise(
                 ValueError,
@@ -730,7 +730,7 @@ class Checks:
 
         return v
 
-    def replacing(self, expected: ta.Any, old: ta.Any, new: T, msg: CheckMessage = None) -> T:
+    def replacing(self, expected: ta.Any, old: ta.Any, new: T, msg: CheckMessage = None, /) -> T:
         if old != expected:
             self._raise(
                 ValueError,
@@ -742,7 +742,7 @@ class Checks:
 
         return new
 
-    def replacing_none(self, old: ta.Any, new: T, msg: CheckMessage = None) -> T:
+    def replacing_none(self, old: ta.Any, new: T, msg: CheckMessage = None, /) -> T:
         if old is not None:
             self._raise(
                 ValueError,
@@ -756,7 +756,7 @@ class Checks:
 
     #
 
-    def arg(self, v: bool, msg: CheckMessage = None) -> None:
+    def arg(self, v: bool, msg: CheckMessage = None, /) -> None:
         if not v:
             self._raise(
                 RuntimeError,
@@ -766,7 +766,7 @@ class Checks:
                 render_fmt='%s',
             )
 
-    def state(self, v: bool, msg: CheckMessage = None) -> None:
+    def state(self, v: bool, msg: CheckMessage = None, /) -> None:
         if not v:
             self._raise(
                 RuntimeError,

omdev-0.0.0.dev528/omdev/dockerdev/config.toml

@@ -0,0 +1,36 @@
+base_image = 'ubuntu:24.04'
+
+dep_sets = [
+    'system',
+    'python',
+    'x11',
+]
+
+jdks = [
+    'zulu21-ca-jdk',
+    'zulu25-ca-jdk',
+]
+
+go_version = '1.26.0'
+
+zig_version = '0.15.2'
+
+nvm_versions = [
+    '20',
+    '22',
+    '25',
+]
+
+pyenv_version_keys = [
+    '8',
+    '13',
+    '14',
+]
+
+config_files = [
+    '.gdbinit',
+    '.tmux.conf',
+    '.vimrc',
+]
+
+workdir = '/omlish'

omdev-0.0.0.dev528/omdev/dockerdev/gen.py

@@ -0,0 +1,186 @@
+"""
+FIXME:
+ - zipsafe / resourcey, but still hard refs .versions file in repo root lol
+
+TODO:
+ - per-feature config, obv
+
+====
+
+docker run --rm -it "$(docker build -q -f x/dockerdev/Dockerfile .)" bash
+"""
+import io
+import tomllib
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import lang
+from omlish import marshal as msh
+
+from .content import LazyContent
+from .content import Resource
+from .helpers import APT_CACHE_MOUNTS
+from .helpers import fragment_section
+from .helpers import read_versions_file_versions
+from .helpers import render_apt_install_dep_sets
+from .ops import Cmd
+from .ops import Entrypoint
+from .ops import Env
+from .ops import From
+from .ops import Op
+from .ops import Run
+from .ops import Section
+from .ops import Workdir
+from .ops import Write
+from .rendering import render_op
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Config:
+    base_image: str
+
+    workdir: str | None = None
+
+    _: dc.KW_ONLY
+
+    dep_sets: ta.Sequence[str] | None = None
+
+    jdks: ta.Sequence[str] | None = None
+
+    go_version: str | None = None
+
+    zig_version: str | None = None
+
+    nvm_versions: ta.Sequence[str] | None = None
+
+    pyenv_version_keys: ta.Sequence[str] | None = None
+
+    config_files: ta.Sequence[str] | None = None
+
+
+##
+
+
+def gen_ops(cfg: Config) -> ta.Sequence[Op]:
+    ops: list[Op] = [
+        From(cfg.base_image),
+    ]
+
+    # ops.append(Section('timestamp', [
+    #     Copy(src='docker/.timestamp', dst='/'),
+    # ]))
+
+    ops.append(Section('locale', [
+        Env([
+            ('LANG', 'en_US.UTF-8'),
+            ('LANGUAGE', 'en_US:en'),
+            ('LC_ALL', 'en_US.UTF-8'),
+        ]),
+    ]))
+
+    ops.append(Section('deps', [
+        Run(
+            [
+                Resource('fragments/apt.sh'),
+                LazyContent(lambda: render_apt_install_dep_sets(*(cfg.dep_sets or []))),
+            ],
+            cache_mounts=APT_CACHE_MOUNTS,
+        ),
+    ]))
+
+    ops.append(fragment_section(
+        'firefox',
+        cache_mounts=APT_CACHE_MOUNTS,
+    ))
+
+    ops.append(fragment_section(
+        'docker',
+        cache_mounts=APT_CACHE_MOUNTS,
+    ))
+
+    if cfg.jdks:
+        ops.append(fragment_section(
+            'jdk',
+            static_env={'JDKS': cfg.jdks},
+            cache_mounts=APT_CACHE_MOUNTS,
+        ))
+
+    ops.append(fragment_section('rust'))
+
+    if cfg.go_version is not None:
+        ops.append(fragment_section(
+            'go',
+            static_env={'GO_VERSION': cfg.go_version},
+        ))
+
+    if cfg.zig_version is not None:
+        ops.append(fragment_section(
+            'zig',
+            static_env={'ZIG_VERSION': cfg.zig_version},
+        ))
+
+    ops.append(fragment_section('vcpkg'))
+
+    if cfg.nvm_versions:
+        ops.append(fragment_section(
+            'nvm',
+            static_env={'NVM_VERSIONS': cfg.nvm_versions},
+        ))
+
+    if cfg.pyenv_version_keys:
+        ops.append(fragment_section(
+            'pyenv',
+            static_env=lambda: {
+                'PYENV_VERSIONS': list(read_versions_file_versions(*[
+                    f'PYTHON_{k}' for k in cfg.pyenv_version_keys
+                ]).values()),
+            },
+            cache_mounts=['/root/.pyenv_cache'],
+        ))
+
+    ops.append(fragment_section('sshd'))
+
+    # ops.append(Section('x11', [
+    #     Run('touch /root/.Xauthority'),
+    #     Write('/root/xu', Resource('xu')),
+    # ]))
+
+    if cfg.config_files:
+        ops.append(Section('configs', [
+            Write(f'/root/{n}', Resource(f'configs/{n}'))
+            for n in cfg.config_files
+        ]))
+
+    ops.append(Section('entrypoint', [
+        *([Workdir(cfg.workdir)] if cfg.workdir is not None else []),
+        Entrypoint(['dumb-init', '--']),
+        Cmd(['sh', '-c', 'echo "Ready" && sleep infinity']),
+    ]))
+
+    return ops
+
+
+##
+
+
+def _main() -> None:
+    cfg_src = lang.get_relative_resources(globals=globals())['config.toml'].read_text()
+    cfg_dct = tomllib.loads(cfg_src)
+    cfg = msh.unmarshal(cfg_dct, Config)
+
+    ops = gen_ops(cfg)
+
+    out = io.StringIO()
+    for i, section in enumerate(ops):
+        if i:
+            out.write('\n\n\n')
+        out.write(render_op(section))
+
+    print(out.getvalue())
+
+
+if __name__ == '__main__':
+    _main()

omdev-0.0.0.dev526/omdev/dockerdev/resources/fragments/rustup.sh → omdev-0.0.0.dev528/omdev/dockerdev/resources/fragments/rust.sh

@@ -1,3 +1,10 @@
 set -ex ;
 
 curl --proto '=https' --tlsv1.2 -sSf 'https://sh.rustup.rs' | sh -s -- -y ;
+
+$HOME/.cargo/bin/cargo install \
+\
+  cargo-edit \
+  rust-script \
+\
+;