omdev 0.0.0.dev363__tar.gz → 0.0.0.dev365__tar.gz

{omdev-0.0.0.dev363/omdev.egg-info → omdev-0.0.0.dev365}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev363
+Version: 0.0.0.dev365
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev363
+Requires-Dist: omlish==0.0.0.dev365
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"
@@ -21,7 +21,7 @@ Requires-Dist: docutils~=0.21; extra == "all"
 Requires-Dist: markdown-it-py~=3.0; extra == "all"
 Requires-Dist: mdit-py-plugins~=0.4; extra == "all"
 Requires-Dist: pygments~=2.19; extra == "all"
-Requires-Dist: mypy~=1.16; extra == "all"
+Requires-Dist: mypy~=1.17; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
@@ -36,7 +36,7 @@ Requires-Dist: markdown-it-py~=3.0; extra == "doc"
 Requires-Dist: mdit-py-plugins~=0.4; extra == "doc"
 Requires-Dist: pygments~=2.19; extra == "doc"
 Provides-Extra: mypy
-Requires-Dist: mypy~=1.16; extra == "mypy"
+Requires-Dist: mypy~=1.17; extra == "mypy"
 Provides-Extra: prof
 Requires-Dist: gprof2dot~=2025.4; extra == "prof"
 Provides-Extra: ptk

{omdev-0.0.0.dev363 → omdev-0.0.0.dev365}/omdev/__about__.py

@@ -31,7 +31,7 @@ class Project(ProjectBase):
         ],
 
         'mypy': [
-            'mypy ~= 1.16',
+            'mypy ~= 1.17',
         ],
 
         'prof': [

{omdev-0.0.0.dev363 → omdev-0.0.0.dev365}/omdev/cc/cli.py

@@ -17,8 +17,11 @@ Freestanding options:
 
 TODO:
  - cext interop
- - gen cmake
+ - cc cmake
+  - shlex shebang to extract opts
   - nanobind
+  - 2 dep mechanisms? not necessarily bad
+ - cc ij, based off of cmake
  - fix CFLAGS/CCFLAGS/CPPFLAGS/CXXFLAGS
  - jit-gen cmake mode? multi-src builds
 """

{omdev-0.0.0.dev363 → omdev-0.0.0.dev365}/omdev/py/docstrings/google.py

@@ -44,7 +44,7 @@ class Section(ta.NamedTuple):
     type: SectionType
 
 
-_GOOGLE_TYPED_ARG_PAT = re.compile(r'\s*(.+?)\s*\(\s*(.*[^\s]+)\s*\)')
+_GOOGLE_TYPED_ARG_PAT = re.compile(r'\s*(.+?)\s*\(\s*(.*\S+)\s*\)')
 _GOOGLE_ARG_DESC_PAT = re.compile(r'.*\. Defaults to (.+)\.')
 _MULTIPLE_PATTERN = re.compile(r'(\s*[^:\s]+:)|([^:]*\]:.*)')
 
@@ -70,7 +70,9 @@ class GoogleParser:
     def __init__(
             self,
             sections: list[Section] | None = None,
+            *,
             title_colon: bool = True,
+            meta_separators: ta.Sequence[str] = ':-',
     ) -> None:
         """
         Setup sections.
@@ -85,6 +87,7 @@ class GoogleParser:
             sections = DEFAULT_SECTIONS
         self.sections = {s.title: s for s in sections}
         self.title_colon = title_colon
+        self.meta_separators = meta_separators
         self._setup()
 
     def _setup(self) -> None:
@@ -94,11 +97,11 @@ class GoogleParser:
             colon = ''
 
         self.titles_re = re.compile(
-            '^('
-            + '|'.join(f'({t})' for t in self.sections)
-            + ')'
-            + colon
-            + '[ \t\r\f\v]*$',
+            '^(' +
+            '|'.join(f'({t})' for t in self.sections) +
+            ')' +
+            colon +
+            '[ \t\r\f\v]*$',
             flags=re.MULTILINE,
         )
 
@@ -122,19 +125,23 @@ class GoogleParser:
         ):
             return self._build_single_meta(section, text)
 
-        if ':' not in text:
-            raise ParseError(f'Expected a colon in {text!r}.')
+        seps = self.meta_separators
+        for sep in seps:
+            if sep not in text:
+                continue
+
+            # Split spec and description
+            before, desc = text.split(sep, 1)
+            if desc:
+                desc = desc[1:] if desc[0] == ' ' else desc
+                if '\n' in desc:
+                    first_line, rest = desc.split('\n', 1)
+                    desc = first_line + '\n' + inspect.cleandoc(rest)
+                desc = desc.strip('\n')
 
-        # Split spec and description
-        before, desc = text.split(':', 1)
-        if desc:
-            desc = desc[1:] if desc[0] == ' ' else desc
-            if '\n' in desc:
-                first_line, rest = desc.split('\n', 1)
-                desc = first_line + '\n' + inspect.cleandoc(rest)
-            desc = desc.strip('\n')
+            return self._build_multi_meta(section, before, desc)
 
-        return self._build_multi_meta(section, before, desc)
+        raise ParseError(f'Expected some separator {seps!r} in {text!r}.')
 
     @staticmethod
     def _build_single_meta(section: Section, desc: str) -> DocstringMeta:
@@ -161,7 +168,7 @@ class GoogleParser:
             )
 
         if section.key in PARAM_KEYWORDS:
-            raise ParseError('Expected paramenter name.')
+            raise ParseError('Expected parameter name.')
 
         return DocstringMeta(args=[section.key], description=desc)
 

{omdev-0.0.0.dev363 → omdev-0.0.0.dev365}/omdev/scripts/ci.py

@@ -962,7 +962,7 @@ class Checks:
                 render_fmt='%s',
             )
 
-        return v  # type: ignore
+        return v
 
     def non_empty_str(self, v: ta.Optional[str], msg: CheckMessage = None) -> str:
         if not isinstance(v, str) or not v:
@@ -1975,6 +1975,31 @@ def unlinking_if_exists(path: str) -> ta.Iterator[None]:
 ##
 
 
+@ta.overload
+def path_dirname(p: str, n: int = 1) -> str:
+    ...
+
+
+@ta.overload
+def path_dirname(p: bytes, n: int = 1) -> bytes:
+    ...
+
+
+def path_dirname(p, n=1):
+    if isinstance(p, bytes):
+        sep: ta.Any = b'/'
+    else:
+        sep = '/'
+    p = os.fspath(p)
+    i = -1
+    for _ in range(n):
+        i = p.rindex(sep, 0, i)
+    head = p[:i + 1]
+    if head and head != sep * len(head):
+        head = head.rstrip(sep)
+    return head
+
+
 def abs_real_path(p: str) -> str:
     return os.path.abspath(os.path.realpath(p))
 
@@ -2858,7 +2883,7 @@ class ArgparseCli:
 
         if self._unknown_args and not (cmd is not None and cmd.accepts_unknown):
             msg = f'unrecognized arguments: {" ".join(self._unknown_args)}'
-            if (parser := self.get_parser()).exit_on_error:  # type: ignore
+            if (parser := self.get_parser()).exit_on_error:
                 parser.error(msg)
             else:
                 raise argparse.ArgumentError(None, msg)
@@ -5812,7 +5837,7 @@ class SubprocessRun:
     ) -> SubprocessRunOutput:
         if subprocesses is None:
             subprocesses = self._DEFAULT_SUBPROCESSES
-        return check.not_none(subprocesses).run_(self.replace(**kwargs))  # type: ignore[attr-defined]
+        return check.not_none(subprocesses).run_(self.replace(**kwargs))
 
     _DEFAULT_ASYNC_SUBPROCESSES: ta.ClassVar[ta.Optional[ta.Any]] = None  # AbstractAsyncSubprocesses
 
@@ -5823,7 +5848,7 @@ class SubprocessRun:
     ) -> SubprocessRunOutput:
         if async_subprocesses is None:
             async_subprocesses = self._DEFAULT_ASYNC_SUBPROCESSES
-        return await check.not_none(async_subprocesses).run_(self.replace(**kwargs))  # type: ignore[attr-defined]
+        return await check.not_none(async_subprocesses).run_(self.replace(**kwargs))
 
 
 SubprocessRun._FIELD_NAMES = frozenset(fld.name for fld in dc.fields(SubprocessRun))  # noqa

{omdev-0.0.0.dev363 → omdev-0.0.0.dev365}/omdev/scripts/interp.py

@@ -989,7 +989,7 @@ class Checks:
                 render_fmt='%s',
             )
 
-        return v  # type: ignore
+        return v
 
     def non_empty_str(self, v: ta.Optional[str], msg: CheckMessage = None) -> str:
         if not isinstance(v, str) or not v:
@@ -2560,7 +2560,7 @@ class ArgparseCli:
 
         if self._unknown_args and not (cmd is not None and cmd.accepts_unknown):
             msg = f'unrecognized arguments: {" ".join(self._unknown_args)}'
-            if (parser := self.get_parser()).exit_on_error:  # type: ignore
+            if (parser := self.get_parser()).exit_on_error:
                 parser.error(msg)
             else:
                 raise argparse.ArgumentError(None, msg)
@@ -3873,7 +3873,7 @@ class SubprocessRun:
     ) -> SubprocessRunOutput:
         if subprocesses is None:
             subprocesses = self._DEFAULT_SUBPROCESSES
-        return check.not_none(subprocesses).run_(self.replace(**kwargs))  # type: ignore[attr-defined]
+        return check.not_none(subprocesses).run_(self.replace(**kwargs))
 
     _DEFAULT_ASYNC_SUBPROCESSES: ta.ClassVar[ta.Optional[ta.Any]] = None  # AbstractAsyncSubprocesses
 
@@ -3884,7 +3884,7 @@ class SubprocessRun:
     ) -> SubprocessRunOutput:
         if async_subprocesses is None:
             async_subprocesses = self._DEFAULT_ASYNC_SUBPROCESSES
-        return await check.not_none(async_subprocesses).run_(self.replace(**kwargs))  # type: ignore[attr-defined]
+        return await check.not_none(async_subprocesses).run_(self.replace(**kwargs))
 
 
 SubprocessRun._FIELD_NAMES = frozenset(fld.name for fld in dc.fields(SubprocessRun))  # noqa

{omdev-0.0.0.dev363 → omdev-0.0.0.dev365}/omdev/scripts/pyproject.py

@@ -2412,7 +2412,7 @@ class Checks:
                 render_fmt='%s',
             )
 
-        return v  # type: ignore
+        return v
 
     def non_empty_str(self, v: ta.Optional[str], msg: CheckMessage = None) -> str:
         if not isinstance(v, str) or not v:
@@ -4352,7 +4352,7 @@ class ArgparseCli:
 
         if self._unknown_args and not (cmd is not None and cmd.accepts_unknown):
             msg = f'unrecognized arguments: {" ".join(self._unknown_args)}'
-            if (parser := self.get_parser()).exit_on_error:  # type: ignore
+            if (parser := self.get_parser()).exit_on_error:
                 parser.error(msg)
             else:
                 raise argparse.ArgumentError(None, msg)
@@ -6263,7 +6263,7 @@ class SubprocessRun:
     ) -> SubprocessRunOutput:
         if subprocesses is None:
             subprocesses = self._DEFAULT_SUBPROCESSES
-        return check.not_none(subprocesses).run_(self.replace(**kwargs))  # type: ignore[attr-defined]
+        return check.not_none(subprocesses).run_(self.replace(**kwargs))
 
     _DEFAULT_ASYNC_SUBPROCESSES: ta.ClassVar[ta.Optional[ta.Any]] = None  # AbstractAsyncSubprocesses
 
@@ -6274,7 +6274,7 @@ class SubprocessRun:
     ) -> SubprocessRunOutput:
         if async_subprocesses is None:
             async_subprocesses = self._DEFAULT_ASYNC_SUBPROCESSES
-        return await check.not_none(async_subprocesses).run_(self.replace(**kwargs))  # type: ignore[attr-defined]
+        return await check.not_none(async_subprocesses).run_(self.replace(**kwargs))
 
 
 SubprocessRun._FIELD_NAMES = frozenset(fld.name for fld in dc.fields(SubprocessRun))  # noqa

{omdev-0.0.0.dev363 → omdev-0.0.0.dev365}/omdev/tools/docker.py

@@ -115,7 +115,7 @@ class Cli(ap.Cli):
         dct: dict[str, list[PortEntry]] = {}
 
         with lang.disposing(yaml.WrappedLoaders.base(yml_src)) as loader:
-            val = check.not_none(loader.get_single_data())  # type: ignore
+            val = check.not_none(loader.get_single_data())
             root = check.isinstance(val.value, ta.Mapping)
 
             services = check.isinstance(

{omdev-0.0.0.dev363 → omdev-0.0.0.dev365}/omdev/tools/json/cli.py

@@ -88,6 +88,7 @@ def _build_args_parser() -> argparse.ArgumentParser:
     parser.add_argument('-x', '--jmespath-expr')
     parser.add_argument('-M', '--marshal', action='store_true')
     parser.add_argument('-F', '--flat', action='store_true')
+    parser.add_argument('-e', '--prune-empty', action='store_true')
     parser.add_argument('-E', '--omit-empty', action='store_true')
 
     parser.add_argument('-z', '--compact', action='store_true')
@@ -136,6 +137,7 @@ def _process_args(args: ta.Any) -> RunConfiguration:
         jmespath_expr=args.jmespath_expr,
         marshal=args.marshal,
         flat=args.flat,
+        prune_empty=args.prune_empty,
         omit_empty=args.omit_empty,
     )
 

{omdev-0.0.0.dev363 → omdev-0.0.0.dev365}/omdev/tools/json/processing.py

@@ -20,9 +20,20 @@ class ProcessingOptions:
     jmespath_expr: ta.Any | None = None
     marshal: bool = False
     flat: bool = False
+    prune_empty: bool = False
     omit_empty: bool = False
 
 
+def _prune_empty(v: ta.Any) -> ta.Any:
+    # if isinstance(v, ta.Mapping):
+    #     v = type(v)([
+    #         (_prune_empty(k), _prune_empty(v))
+    #         for k, v in v.items()
+    #     ])
+    # elif
+    raise NotImplementedError
+
+
 class Processor:
     def __init__(self, opts: ProcessingOptions) -> None:
         super().__init__()
@@ -68,6 +79,9 @@ class Processor:
             vs = [v]
 
         for v in vs:
+            if self._opts.prune_empty:
+                v = _prune_empty(v)
+
             if self._opts.omit_empty:
                 if v is None or (isinstance(v, (ta.Sequence, ta.Mapping)) and not v):
                     continue

{omdev-0.0.0.dev363 → omdev-0.0.0.dev365/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev363
+Version: 0.0.0.dev365
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev363
+Requires-Dist: omlish==0.0.0.dev365
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"
@@ -21,7 +21,7 @@ Requires-Dist: docutils~=0.21; extra == "all"
 Requires-Dist: markdown-it-py~=3.0; extra == "all"
 Requires-Dist: mdit-py-plugins~=0.4; extra == "all"
 Requires-Dist: pygments~=2.19; extra == "all"
-Requires-Dist: mypy~=1.16; extra == "all"
+Requires-Dist: mypy~=1.17; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
@@ -36,7 +36,7 @@ Requires-Dist: markdown-it-py~=3.0; extra == "doc"
 Requires-Dist: mdit-py-plugins~=0.4; extra == "doc"
 Requires-Dist: pygments~=2.19; extra == "doc"
 Provides-Extra: mypy
-Requires-Dist: mypy~=1.16; extra == "mypy"
+Requires-Dist: mypy~=1.17; extra == "mypy"
 Provides-Extra: prof
 Requires-Dist: gprof2dot~=2025.4; extra == "prof"
 Provides-Extra: ptk

{omdev-0.0.0.dev363 → omdev-0.0.0.dev365}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev363
+omlish==0.0.0.dev365
 
 [all]
 black~=25.1
@@ -8,7 +8,7 @@ docutils~=0.21
 markdown-it-py~=3.0
 mdit-py-plugins~=0.4
 pygments~=2.19
-mypy~=1.16
+mypy~=1.17
 gprof2dot~=2025.4
 prompt-toolkit~=3.0
 segno~=1.6
@@ -27,7 +27,7 @@ mdit-py-plugins~=0.4
 pygments~=2.19
 
 [mypy]
-mypy~=1.16
+mypy~=1.17
 
 [prof]
 gprof2dot~=2025.4

{omdev-0.0.0.dev363 → omdev-0.0.0.dev365}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.13'
-version = '0.0.0.dev363'
+version = '0.0.0.dev365'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev363',
+    'omlish == 0.0.0.dev365',
 ]
 
 [project.optional-dependencies]
@@ -34,7 +34,7 @@ all = [
     'markdown-it-py ~= 3.0',
     'mdit-py-plugins ~= 0.4',
     'pygments ~= 2.19',
-    'mypy ~= 1.16',
+    'mypy ~= 1.17',
     'gprof2dot ~= 2025.4',
     'prompt-toolkit ~= 3.0',
     'segno ~= 1.6',
@@ -53,7 +53,7 @@ doc = [
     'pygments ~= 2.19',
 ]
 mypy = [
-    'mypy ~= 1.16',
+    'mypy ~= 1.17',
 ]
 prof = [
     'gprof2dot ~= 2025.4',