omdev 0.0.0.dev527__tar.gz → 0.0.0.dev529__tar.gz

{omdev-0.0.0.dev527/omdev.egg-info → omdev-0.0.0.dev529}/PKG-INFO

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

{omdev-0.0.0.dev527 → omdev-0.0.0.dev529}/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.dev527 → omdev-0.0.0.dev529}/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.dev527 → omdev-0.0.0.dev529}/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.dev527 → omdev-0.0.0.dev529}/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='df0ed561b5782545e34e61dd3424f69f836a87c0'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
@@ -333,23 +333,25 @@ class Checks:
 
     #
 
-    def _unpack_isinstance_spec(self, spec: ta.Any) -> tuple:
-        if isinstance(spec, type):
-            return (spec,)
+    def _unpack_isinstance_spec(self, spec: ta.Any) -> ta.Any:
+        if spec == ta.Any:
+            return object
+        if spec is None:
+            return None.__class__
         if not isinstance(spec, tuple):
-            spec = (spec,)
+            return spec
+        if ta.Any in spec:
+            return object
         if None in spec:
             spec = tuple(filter(None, spec)) + (None.__class__,)  # noqa
-        if ta.Any in spec:
-            spec = (object,)
         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 +367,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 +382,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 +393,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 +411,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 +421,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 +433,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 +445,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 +464,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 +476,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 +488,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 +500,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 +517,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 +529,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 +541,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 +555,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 +577,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 +606,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 +636,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 +646,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 +660,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 +672,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 +684,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 +696,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 +708,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 +720,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 +732,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 +744,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 +758,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 +768,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.dev527 → omdev-0.0.0.dev529}/omdev/dockerdev/gen.py

@@ -1,7 +1,4 @@
 """
-FIXME:
- - zipsafe / resourcey, but still hard refs .versions file in repo root lol
-
 TODO:
  - per-feature config, obv
 
@@ -134,9 +131,11 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
         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()),
+                'PYENV_VERSIONS': list(read_versions_file_versions(
+                    'resources',
+                    '.python-versions.json',
+                    cfg.pyenv_version_keys,
+                ).values()),
             },
             cache_mounts=['/root/.pyenv_cache'],
         ))

{omdev-0.0.0.dev527 → omdev-0.0.0.dev529}/omdev/dockerdev/helpers.py

@@ -1,7 +1,11 @@
 import io
+import json
 import tomllib
 import typing as ta
 
+from omlish import check
+from omlish import lang
+
 from .content import Content
 from .content import Resource
 from .content import StaticEnv
@@ -63,21 +67,13 @@ def render_apt_install_dep_sets(*names: str) -> str:
 ##
 
 
-def read_versions_file(file_path: str | None = None) -> ta.Mapping[str, str]:
-    if file_path is None:
-        file_path = '.versions'
-    with open(file_path) as f:
-        s = f.read()
-
-    return {
-        k.strip(): v.strip()
-        for l in s.splitlines()
-        for l in [l.split('#')[0].strip()]
-        if '=' in l
-        for k, _, v in [l.partition('=')]
-    }
-
-
-def read_versions_file_versions(*keys: str, file_path: str | None = None) -> ta.Mapping[str, str]:
-    dct = read_versions_file(file_path)
+def read_versions_file_versions(
+        resource_path: str,
+        resource_name: str,
+        keys: ta.Sequence[str],
+) -> ta.Mapping[str, str]:
+    check.not_isinstance(keys, str)
+    rs = lang.get_relative_resources(resource_path, globals=globals())
+    src = rs[resource_name].read_text()
+    dct = json.loads(src)
     return {k: dct[k] for k in keys}

omdev-0.0.0.dev529/omdev/dockerdev/resources/.pkgdata

@@ -0,0 +1,2 @@
+*
+.*

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

@@ -0,0 +1,15 @@
+{
+  "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",
+  "14t": "3.14.3t",
+  "15": "3.15.0a6",
+  "15t": "3.15.0a6t"
+}

omdev-0.0.0.dev529/omdev/dockerdev/resources/configs/.gdbinit

@@ -0,0 +1,2 @@
+handle SIGUSR1 nostop noprint
+handle SIGUSR2 nostop noprint

omdev-0.0.0.dev529/omdev/dockerdev/resources/configs/.pkgdata

@@ -0,0 +1,2 @@
+*
+.*

omdev-0.0.0.dev529/omdev/dockerdev/resources/configs/.tmux.conf

@@ -0,0 +1,7 @@
+setw -g mode-keys vi
+set -g status-keys vi
+set -sg escape-time 0
+set -g status-fg black
+set -g history-limit 50000
+set -g update-environment "DISPLAY"
+set -sg default-terminal "xterm-256color"

omdev-0.0.0.dev529/omdev/dockerdev/resources/configs/.vimrc

@@ -0,0 +1,6 @@
+set number
+syntax on
+filetype indent plugin on
+set tabstop=4
+set shiftwidth=4
+set expandtab

{omdev-0.0.0.dev527 → omdev-0.0.0.dev529}/omdev/java/cli.py

@@ -54,6 +54,7 @@ def build_maven_project(
         src_file: str,
         *,
         deps: ta.Sequence[str] | None = None,
+        require_symlink: bool = False,
 ) -> pg.Project:
     with open(src_file) as f:
         src = f.read()
@@ -64,9 +65,13 @@ def build_maven_project(
 
     if (pms := list(filter(None, map(PACKAGE_PAT.fullmatch, src.splitlines())))):
         group_id = pms[0].group(1)
+        can_symlink = True
     else:
+        if require_symlink:
+            raise ValueError(f'Cannot symlink source file, no package specified.')
         group_id = DEFAULT_PROJECT_GROUP_ID
         src = f'package {group_id};\n\n{src}'
+        can_symlink = False
 
     check.non_empty_str(group_id)
     group_id_parts = group_id.split('.')
@@ -109,8 +114,12 @@ def build_maven_project(
         sp_dir = os.path.join(sp_dir, gi_part)
     os.makedirs(sp_dir)
 
-    with open(os.path.join(sp_dir, os.path.basename(src_file)), 'w') as f:
-        f.write(src)
+    sp_src_file = os.path.join(sp_dir, os.path.basename(src_file))
+    if can_symlink:
+        os.symlink(os.path.abspath(src_file), os.path.abspath(sp_src_file))
+    else:
+        with open(sp_src_file, 'w') as f:
+            f.write(src)
 
     with open(os.path.join(root_dir, 'pom.xml'), 'w') as f:
         f.write(pom_xml)