omdev 0.0.0.dev215__py3-none-any.whl → 0.0.0.dev217__py3-none-any.whl

omdev/.manifests.json

@@ -195,7 +195,7 @@
     "module": ".scripts.exectime",
     "attr": "_CLI_MODULE",
     "file": "omdev/scripts/exectime.py",
-    "line": 7,
+    "line": 66,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/exectime",

omdev/precheck/lite.py

@@ -25,13 +25,46 @@ log = logging.getLogger(__name__)
 class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
     @dc.dataclass(frozen=True)
     class Config(Precheck.Config):
-        pass
+        python: str = '.venvs/8/bin/python'
+        concurrency: int = 4
 
     def __init__(self, context: PrecheckContext, config: Config = Config()) -> None:
         super().__init__(context, config)
 
     #
 
+    @dc.dataclass(frozen=True)
+    class _Target:
+        path: str
+        kind: ta.Literal['script', 'module']
+
+    async def _collect_targets(self) -> list[_Target]:
+        lst = []
+
+        for fp in magic.find_magic_files(
+                magic.PY_MAGIC_STYLE,
+                self._context.src_roots,
+                keys=['@omlish-lite'],
+        ):
+            with open(fp) as f:  # noqa  # FIXME
+                src = f.read()
+
+            is_script = '# @omlish-script' in src.splitlines()
+
+            if is_script:
+                lst.append(self._Target(fp, 'script'))
+
+            elif fp.endswith('__init__.py'):
+                for g in glob.glob(os.path.join(os.path.dirname(fp), '**/*.py'), recursive=True):
+                    lst.append(self._Target(g, 'module'))
+
+            else:
+                lst.append(self._Target(fp, 'module'))
+
+        return lst
+
+    #
+
     @staticmethod
     def _load_file_module(fp: str) -> None:
         import os.path  # noqa
@@ -71,7 +104,7 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
 
         proc = await asyncio.create_subprocess_exec(
             *subprocess_maybe_shell_wrap_exec(
-                '.venvs/8/bin/python',
+                self._config.python,
                 '-c',
                 self._load_file_module_payload(),
                 fp,
@@ -85,7 +118,7 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
 
         return vs
 
-    async def _run_one_module(self, fp: str) -> list[Precheck.Violation]:
+    async def _run_module(self, fp: str) -> list[Precheck.Violation]:
         vs: list[Precheck.Violation] = []
 
         mod = fp.rpartition('.')[0].replace(os.sep, '.')
@@ -94,7 +127,7 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
 
         proc = await asyncio.create_subprocess_exec(
             *subprocess_maybe_shell_wrap_exec(
-                '.venvs/8/bin/python',
+                self._config.python,
                 '-c',
                 f'import {mod}',
             ),
@@ -107,34 +140,29 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
 
         return vs
 
-    async def _run_module(self, fp: str) -> list[Precheck.Violation]:
-        vs: list[Precheck.Violation] = []
+    #
 
-        if fp.endswith('__init__.py'):
-            pfps = glob.glob(os.path.join(os.path.dirname(fp), '**/*.py'), recursive=True)
-        else:
-            pfps = [fp]
+    async def _run_one(self, tgt: _Target) -> list[Precheck.Violation]:
+        if tgt.kind == 'script':
+            return await self._run_script(tgt.path)
 
-        for pfp in pfps:
-            vs.extend(await self._run_one_module(pfp))
+        elif tgt.kind == 'module':
+            return await self._run_module(tgt.path)
 
-        return vs
+        else:
+            raise RuntimeError(f'Unknown target kind: {tgt.kind}')
 
     async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
-        for fp in magic.find_magic_files(
-                magic.PY_MAGIC_STYLE,
-                self._context.src_roots,
-                keys=['@omlish-lite'],
-        ):
-            with open(fp) as f:  # noqa  # FIXME
-                src = f.read()
+        tgts = await self._collect_targets()
 
-            is_script = '# @omlish-script' in src.splitlines()
+        sem = asyncio.Semaphore(self._config.concurrency)
 
-            if is_script:
-                for v in await self._run_script(fp):
-                    yield v
+        async def run(tgt):
+            async with sem:
+                return await self._run_one(tgt)
 
-            else:
-                for v in await self._run_module(fp):
-                    yield v
+        tasks = [asyncio.create_task(run(tgt)) for tgt in tgts]
+
+        for coro in asyncio.as_completed(tasks):
+            for v in await coro:
+                yield v

omdev/precheck/main.py

@@ -60,6 +60,7 @@ def _check_cmd(args) -> None:
         vs: list[Precheck.Violation] = []
 
         for pc in pcs:
+            log.info('Running precheck: %s', type(pc).__name__)
             async for v in pc.run():
                 vs.append(v)
                 print('*** VIOLATION ***')

omdev/scripts/ci.py

@@ -167,7 +167,7 @@ def asyncio_once(fn: CallableT) -> CallableT:
     return ta.cast(CallableT, inner)
 
 
-def drain_tasks(loop=None):
+def drain_asyncio_tasks(loop=None):
     if loop is None:
         loop = asyncio.get_running_loop()
 
@@ -182,7 +182,7 @@ def draining_asyncio_tasks() -> ta.Iterator[None]:
         yield
     finally:
         if loop is not None:
-            drain_tasks(loop)  # noqa
+            drain_asyncio_tasks(loop)  # noqa
 
 
 async def asyncio_wait_concurrent(
@@ -2563,7 +2563,7 @@ TODO:
 
 STANDARD_LOG_FORMAT_PARTS = [
     ('asctime', '%(asctime)-15s'),
-    ('process', 'pid=%(process)-6s'),
+    ('process', 'pid=%(process)s'),
     ('thread', 'tid=%(thread)x'),
     ('levelname', '%(levelname)s'),
     ('name', '%(name)s'),
@@ -2676,6 +2676,12 @@ def configure_standard_logging(
 ##
 
 
+# Valid channel type kwarg values:
+#  - A special flag negative int
+#  - A positive fd int
+#  - A file-like object
+#  - None
+
 SUBPROCESS_CHANNEL_OPTION_VALUES: ta.Mapping[SubprocessChannelOption, int] = {
     'pipe': subprocess.PIPE,
     'stdout': subprocess.STDOUT,
@@ -2721,6 +2727,25 @@ def subprocess_close(
 ##
 
 
+class VerboseCalledProcessError(subprocess.CalledProcessError):
+    @classmethod
+    def from_std(cls, e: subprocess.CalledProcessError) -> 'VerboseCalledProcessError':
+        return cls(
+            e.returncode,
+            e.cmd,
+            output=e.output,
+            stderr=e.stderr,
+        )
+
+    def __str__(self) -> str:
+        msg = super().__str__()
+        if self.output is not None:
+            msg += f' Output: {self.output!r}'
+        if self.stderr is not None:
+            msg += f' Stderr: {self.stderr!r}'
+        return msg
+
+
 class BaseSubprocesses(abc.ABC):  # noqa
     DEFAULT_LOGGER: ta.ClassVar[ta.Optional[logging.Logger]] = None
 
@@ -2754,16 +2779,31 @@ class BaseSubprocesses(abc.ABC):  # noqa
             if extra_env:
                 self._log.debug('Subprocesses.prepare_args: extra_env=%r', extra_env)
 
+        #
+
         if extra_env:
             env = {**(env if env is not None else os.environ), **extra_env}
 
+        #
+
         if quiet and 'stderr' not in kwargs:
             if self._log and not self._log.isEnabledFor(logging.DEBUG):
                 kwargs['stderr'] = subprocess.DEVNULL
 
+        for chk in ('stdout', 'stderr'):
+            try:
+                chv = kwargs[chk]
+            except KeyError:
+                continue
+            kwargs[chk] = SUBPROCESS_CHANNEL_OPTION_VALUES.get(chv, chv)
+
+        #
+
         if not shell:
             cmd = subprocess_maybe_shell_wrap_exec(*cmd)
 
+        #
+
         return cmd, dict(
             env=env,
             shell=shell,
@@ -2771,35 +2811,57 @@ class BaseSubprocesses(abc.ABC):  # noqa
         )
 
     @contextlib.contextmanager
-    def wrap_call(self, *cmd: ta.Any, **kwargs: ta.Any) -> ta.Iterator[None]:
+    def wrap_call(
+            self,
+            *cmd: ta.Any,
+            raise_verbose: bool = False,
+            **kwargs: ta.Any,
+    ) -> ta.Iterator[None]:
         start_time = time.time()
         try:
             if self._log:
                 self._log.debug('Subprocesses.wrap_call.try: cmd=%r', cmd)
+
             yield
 
         except Exception as exc:  # noqa
             if self._log:
                 self._log.debug('Subprocesses.wrap_call.except: exc=%r', exc)
+
+            if (
+                    raise_verbose and
+                    isinstance(exc, subprocess.CalledProcessError) and
+                    not isinstance(exc, VerboseCalledProcessError) and
+                    (exc.output is not None or exc.stderr is not None)
+            ):
+                raise VerboseCalledProcessError.from_std(exc) from exc
+
             raise
 
         finally:
             end_time = time.time()
             elapsed_s = end_time - start_time
+
             if self._log:
-                self._log.debug('sSubprocesses.wrap_call.finally: elapsed_s=%f cmd=%r', elapsed_s, cmd)
+                self._log.debug('Subprocesses.wrap_call.finally: elapsed_s=%f cmd=%r', elapsed_s, cmd)
 
     @contextlib.contextmanager
     def prepare_and_wrap(
             self,
             *cmd: ta.Any,
+            raise_verbose: bool = False,
             **kwargs: ta.Any,
     ) -> ta.Iterator[ta.Tuple[
         ta.Tuple[ta.Any, ...],
         ta.Dict[str, ta.Any],
     ]]:
         cmd, kwargs = self.prepare_args(*cmd, **kwargs)
-        with self.wrap_call(*cmd, **kwargs):
+
+        with self.wrap_call(
+                *cmd,
+                raise_verbose=raise_verbose,
+                **kwargs,
+        ):
             yield cmd, kwargs
 
     #

omdev/scripts/exectime.py

@@ -1,7 +1,66 @@
 #!/usr/bin/env python3
 # @omlish-script
-import sys
-import time
+
+
+##
+
+
+def _run_one(src, pre=None):
+    import time
+
+    if pre:
+        exec(pre)
+
+    co = compile(src, '<string>', 'exec')
+    start = time.time_ns()
+    exec(co)
+    end = time.time_ns()
+
+    return end - start
+
+
+##
+
+
+def _run(n, src, pre=None):
+    if n is None:
+        return _run_one(src, pre=pre)
+
+    #
+
+    import inspect
+
+    cmd = '\n'.join([
+        inspect.getsource(_run_one),
+        f'print(_run_one({src!r}, pre={pre!r}))',
+    ])
+
+    #
+
+    import subprocess
+    import sys
+
+    ts = []
+    for _ in range(n):
+        out = subprocess.check_output([sys.executable, '-c', cmd]).decode()
+        t = int(out.strip())
+        ts.append(t)
+
+    #
+
+    import statistics
+
+    o = {
+        # 'times': ts,
+        'mean': statistics.mean(ts),
+        'median': statistics.median(ts),
+        'quantiles': statistics.quantiles(ts),
+    }
+
+    return o
+
+
+##
 
 
 # @omlish-manifest
@@ -11,23 +70,36 @@ _CLI_MODULE = {'$omdev.cli.types.CliModule': {
 }}
 
 
-def _main() -> None:
-    if len(sys.argv) == 2:
-        pre = None
-        [src] = sys.argv[1:]
-    elif len(sys.argv) == 3:
-        [pre, src] = sys.argv[1:]
+def _main():
+    import sys
+
+    args = sys.argv[1:]
+
+    n = None
+    if args:
+        try:
+            n = int(args[0])
+        except ValueError:
+            pass
+        else:
+            args.pop(0)
+
+    if len(args) > 1:
+        pre = args.pop(0)
     else:
+        pre = None
+
+    if len(args) != 1:
         raise Exception('Invalid arguments')
+    [src] = args
 
-    if pre:
-        exec(pre)
+    #
 
-    co = compile(src, '<string>', 'exec')
-    start = time.time_ns()
-    exec(co)
-    end = time.time_ns()
-    print(end - start)
+    o = _run(n, src, pre=pre)
+
+    import json
+
+    print(json.dumps(o, indent=2))
 
 
 if __name__ == '__main__':

omdev/scripts/interp.py

@@ -3500,7 +3500,7 @@ TODO:
 
 STANDARD_LOG_FORMAT_PARTS = [
     ('asctime', '%(asctime)-15s'),
-    ('process', 'pid=%(process)-6s'),
+    ('process', 'pid=%(process)s'),
     ('thread', 'tid=%(thread)x'),
     ('levelname', '%(levelname)s'),
     ('name', '%(name)s'),
@@ -3613,6 +3613,12 @@ def configure_standard_logging(
 ##
 
 
+# Valid channel type kwarg values:
+#  - A special flag negative int
+#  - A positive fd int
+#  - A file-like object
+#  - None
+
 SUBPROCESS_CHANNEL_OPTION_VALUES: ta.Mapping[SubprocessChannelOption, int] = {
     'pipe': subprocess.PIPE,
     'stdout': subprocess.STDOUT,
@@ -3658,6 +3664,25 @@ def subprocess_close(
 ##
 
 
+class VerboseCalledProcessError(subprocess.CalledProcessError):
+    @classmethod
+    def from_std(cls, e: subprocess.CalledProcessError) -> 'VerboseCalledProcessError':
+        return cls(
+            e.returncode,
+            e.cmd,
+            output=e.output,
+            stderr=e.stderr,
+        )
+
+    def __str__(self) -> str:
+        msg = super().__str__()
+        if self.output is not None:
+            msg += f' Output: {self.output!r}'
+        if self.stderr is not None:
+            msg += f' Stderr: {self.stderr!r}'
+        return msg
+
+
 class BaseSubprocesses(abc.ABC):  # noqa
     DEFAULT_LOGGER: ta.ClassVar[ta.Optional[logging.Logger]] = None
 
@@ -3691,16 +3716,31 @@ class BaseSubprocesses(abc.ABC):  # noqa
             if extra_env:
                 self._log.debug('Subprocesses.prepare_args: extra_env=%r', extra_env)
 
+        #
+
         if extra_env:
             env = {**(env if env is not None else os.environ), **extra_env}
 
+        #
+
         if quiet and 'stderr' not in kwargs:
             if self._log and not self._log.isEnabledFor(logging.DEBUG):
                 kwargs['stderr'] = subprocess.DEVNULL
 
+        for chk in ('stdout', 'stderr'):
+            try:
+                chv = kwargs[chk]
+            except KeyError:
+                continue
+            kwargs[chk] = SUBPROCESS_CHANNEL_OPTION_VALUES.get(chv, chv)
+
+        #
+
         if not shell:
             cmd = subprocess_maybe_shell_wrap_exec(*cmd)
 
+        #
+
         return cmd, dict(
             env=env,
             shell=shell,
@@ -3708,35 +3748,57 @@ class BaseSubprocesses(abc.ABC):  # noqa
         )
 
     @contextlib.contextmanager
-    def wrap_call(self, *cmd: ta.Any, **kwargs: ta.Any) -> ta.Iterator[None]:
+    def wrap_call(
+            self,
+            *cmd: ta.Any,
+            raise_verbose: bool = False,
+            **kwargs: ta.Any,
+    ) -> ta.Iterator[None]:
         start_time = time.time()
         try:
             if self._log:
                 self._log.debug('Subprocesses.wrap_call.try: cmd=%r', cmd)
+
             yield
 
         except Exception as exc:  # noqa
             if self._log:
                 self._log.debug('Subprocesses.wrap_call.except: exc=%r', exc)
+
+            if (
+                    raise_verbose and
+                    isinstance(exc, subprocess.CalledProcessError) and
+                    not isinstance(exc, VerboseCalledProcessError) and
+                    (exc.output is not None or exc.stderr is not None)
+            ):
+                raise VerboseCalledProcessError.from_std(exc) from exc
+
             raise
 
         finally:
             end_time = time.time()
             elapsed_s = end_time - start_time
+
             if self._log:
-                self._log.debug('sSubprocesses.wrap_call.finally: elapsed_s=%f cmd=%r', elapsed_s, cmd)
+                self._log.debug('Subprocesses.wrap_call.finally: elapsed_s=%f cmd=%r', elapsed_s, cmd)
 
     @contextlib.contextmanager
     def prepare_and_wrap(
             self,
             *cmd: ta.Any,
+            raise_verbose: bool = False,
             **kwargs: ta.Any,
     ) -> ta.Iterator[ta.Tuple[
         ta.Tuple[ta.Any, ...],
         ta.Dict[str, ta.Any],
     ]]:
         cmd, kwargs = self.prepare_args(*cmd, **kwargs)
-        with self.wrap_call(*cmd, **kwargs):
+
+        with self.wrap_call(
+                *cmd,
+                raise_verbose=raise_verbose,
+                **kwargs,
+        ):
             yield cmd, kwargs
 
     #

omdev/scripts/pyproject.py

@@ -5740,7 +5740,7 @@ TODO:
 
 STANDARD_LOG_FORMAT_PARTS = [
     ('asctime', '%(asctime)-15s'),
-    ('process', 'pid=%(process)-6s'),
+    ('process', 'pid=%(process)s'),
     ('thread', 'tid=%(thread)x'),
     ('levelname', '%(levelname)s'),
     ('name', '%(name)s'),
@@ -5853,6 +5853,12 @@ def configure_standard_logging(
 ##
 
 
+# Valid channel type kwarg values:
+#  - A special flag negative int
+#  - A positive fd int
+#  - A file-like object
+#  - None
+
 SUBPROCESS_CHANNEL_OPTION_VALUES: ta.Mapping[SubprocessChannelOption, int] = {
     'pipe': subprocess.PIPE,
     'stdout': subprocess.STDOUT,
@@ -5898,6 +5904,25 @@ def subprocess_close(
 ##
 
 
+class VerboseCalledProcessError(subprocess.CalledProcessError):
+    @classmethod
+    def from_std(cls, e: subprocess.CalledProcessError) -> 'VerboseCalledProcessError':
+        return cls(
+            e.returncode,
+            e.cmd,
+            output=e.output,
+            stderr=e.stderr,
+        )
+
+    def __str__(self) -> str:
+        msg = super().__str__()
+        if self.output is not None:
+            msg += f' Output: {self.output!r}'
+        if self.stderr is not None:
+            msg += f' Stderr: {self.stderr!r}'
+        return msg
+
+
 class BaseSubprocesses(abc.ABC):  # noqa
     DEFAULT_LOGGER: ta.ClassVar[ta.Optional[logging.Logger]] = None
 
@@ -5931,16 +5956,31 @@ class BaseSubprocesses(abc.ABC):  # noqa
             if extra_env:
                 self._log.debug('Subprocesses.prepare_args: extra_env=%r', extra_env)
 
+        #
+
         if extra_env:
             env = {**(env if env is not None else os.environ), **extra_env}
 
+        #
+
         if quiet and 'stderr' not in kwargs:
             if self._log and not self._log.isEnabledFor(logging.DEBUG):
                 kwargs['stderr'] = subprocess.DEVNULL
 
+        for chk in ('stdout', 'stderr'):
+            try:
+                chv = kwargs[chk]
+            except KeyError:
+                continue
+            kwargs[chk] = SUBPROCESS_CHANNEL_OPTION_VALUES.get(chv, chv)
+
+        #
+
         if not shell:
             cmd = subprocess_maybe_shell_wrap_exec(*cmd)
 
+        #
+
         return cmd, dict(
             env=env,
             shell=shell,
@@ -5948,35 +5988,57 @@ class BaseSubprocesses(abc.ABC):  # noqa
         )
 
     @contextlib.contextmanager
-    def wrap_call(self, *cmd: ta.Any, **kwargs: ta.Any) -> ta.Iterator[None]:
+    def wrap_call(
+            self,
+            *cmd: ta.Any,
+            raise_verbose: bool = False,
+            **kwargs: ta.Any,
+    ) -> ta.Iterator[None]:
         start_time = time.time()
         try:
             if self._log:
                 self._log.debug('Subprocesses.wrap_call.try: cmd=%r', cmd)
+
             yield
 
         except Exception as exc:  # noqa
             if self._log:
                 self._log.debug('Subprocesses.wrap_call.except: exc=%r', exc)
+
+            if (
+                    raise_verbose and
+                    isinstance(exc, subprocess.CalledProcessError) and
+                    not isinstance(exc, VerboseCalledProcessError) and
+                    (exc.output is not None or exc.stderr is not None)
+            ):
+                raise VerboseCalledProcessError.from_std(exc) from exc
+
             raise
 
         finally:
             end_time = time.time()
             elapsed_s = end_time - start_time
+
             if self._log:
-                self._log.debug('sSubprocesses.wrap_call.finally: elapsed_s=%f cmd=%r', elapsed_s, cmd)
+                self._log.debug('Subprocesses.wrap_call.finally: elapsed_s=%f cmd=%r', elapsed_s, cmd)
 
     @contextlib.contextmanager
     def prepare_and_wrap(
             self,
             *cmd: ta.Any,
+            raise_verbose: bool = False,
             **kwargs: ta.Any,
     ) -> ta.Iterator[ta.Tuple[
         ta.Tuple[ta.Any, ...],
         ta.Dict[str, ta.Any],
     ]]:
         cmd, kwargs = self.prepare_args(*cmd, **kwargs)
-        with self.wrap_call(*cmd, **kwargs):
+
+        with self.wrap_call(
+                *cmd,
+                raise_verbose=raise_verbose,
+                **kwargs,
+        ):
             yield cmd, kwargs
 
     #

omdev/tools/json/formats.py

@@ -18,6 +18,7 @@ if ta.TYPE_CHECKING:
     import yaml
 
     from omlish.formats import dotenv
+    from omlish.formats import json5
     from omlish.formats import props
     from omlish.formats import xml
 
@@ -29,6 +30,7 @@ else:
     yaml = lang.proxy_import('yaml')
 
     dotenv = lang.proxy_import('omlish.formats.dotenv')
+    json5 = lang.proxy_import('omlish.formats.json5')
     props = lang.proxy_import('omlish.formats.props')
     xml = lang.proxy_import('omlish.formats.xml')
 
@@ -45,6 +47,8 @@ class Format:
 class Formats(enum.Enum):
     JSON = Format(['json'], json.load)
 
+    JSON5 = Format(['json5'], lambda f: json5.loads(f.read()))
+
     YAML = Format(['yaml', 'yml'], lambda f: yaml.safe_load(f))
 
     TOML = Format(['toml'], lambda f: tomllib.loads(f.read()))

{omdev-0.0.0.dev215.dist-info → omdev-0.0.0.dev217.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev215
+Version: 0.0.0.dev217
 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.dev215
+Requires-Dist: omlish==0.0.0.dev217
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev215.dist-info → omdev-0.0.0.dev217.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=VUg0T7DFMxatE-hsLqocMvGoNmELDiZZaudO1tcz-FE,9092
+omdev/.manifests.json,sha256=02pFpcoefn9JQr0AIqt_6-BnWi49KF0baoGEKv8bjn0,9093
 omdev/__about__.py,sha256=j3vFclhFvyPICV6FK4aDApFzMCqJWxv9FaWwdwXrSgw,1215
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
@@ -150,8 +150,8 @@ omdev/precheck/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/precheck/__main__.py,sha256=UEuS4z5-heIrwTtB-ONe1KeXJdqj8tYXMqWMpuO10so,165
 omdev/precheck/base.py,sha256=a_lGoFM-QhL8u8XDUYFhb-feEyfPbP4j8lcmNO51sHY,732
 omdev/precheck/git.py,sha256=APC5Ln7x0zDrQiGPRWPsBcVJK3vWhbU-brqR5M63JQA,849
-omdev/precheck/lite.py,sha256=eQjEBigjKj-y8xbDe0VnPPQYReGmxGERykyHi2cpEuM,3878
-omdev/precheck/main.py,sha256=QL2en3Vn8nnuRTnPeipK9ovc2KrXtv1CkT2YGPqxCio,2884
+omdev/precheck/lite.py,sha256=kk41zbA2y1K0sMlbd6UyJP2mOW2I_iT6iaUW12F6mJY,4629
+omdev/precheck/main.py,sha256=XkwQnC_4YH-0P9YYkVxKUHAAj0o6iXiCu6S-oU_WaQk,2948
 omdev/precheck/manifests.py,sha256=ulwuYeZ0vnRsj8uTUbQGifoBNwI82MAsJuffs3rVIak,760
 omdev/precheck/scripts.py,sha256=Xw9kkQzlDd_2V9av9qlaNpNZG9jZdy3TTo7x60MeR2I,1273
 omdev/ptk/__init__.py,sha256=QIu7cMeCKgNiXvIt7pXTESToJLuRMN0Qsxns_Z7ci0k,641
@@ -174,12 +174,12 @@ omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQ
 omdev/pyproject/resources/python.sh,sha256=jvrwddYw2KNttpuImLbdCdJK0HsUNMrHtTnmLvhxQxg,757
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
 omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,1064
-omdev/scripts/ci.py,sha256=yDx6VsztaY1VqYWF1i9Ywt2YTIseSc5wYtdvtmh5qyI,108870
+omdev/scripts/ci.py,sha256=2bMl2vCMHdKQf2AmbcWV9Syv6RdizibYRDlT5Vg6q3E,110397
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
-omdev/scripts/exectime.py,sha256=sFb376GflU6s9gNX-2-we8hgH6w5MuQNS9g6i4SqJIo,610
+omdev/scripts/exectime.py,sha256=S2O4MgtzTsFOY2IUJxsrnOIame9tEFc6aOlKP-F1JSg,1541
 omdev/scripts/importtrace.py,sha256=oa7CtcWJVMNDbyIEiRHej6ICfABfErMeo4_haIqe18Q,14041
-omdev/scripts/interp.py,sha256=7NrLbOkiDjBldnzpf-EpL8UTmU6U3lakvHqhSlY3X_U,141851
-omdev/scripts/pyproject.py,sha256=HDors8tvpSgCUzESwQ2E-Gx5jLisaYoOApOTCgmQ5P0,245595
+omdev/scripts/interp.py,sha256=40KDm-mW8v7Mmhi4WByV9XzWPgwvTfKYsFKlojXR4k0,143362
+omdev/scripts/pyproject.py,sha256=TG3Ne6h1W2rwT8nBG9E7QCmN_adPIO24QYaSJ7JGreU,247106
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -203,7 +203,7 @@ omdev/tools/sqlrepl.py,sha256=wAjrfXNrRV63-NJCC2HlGQnFh7lUH0bHMnOjYotQqFs,5753
 omdev/tools/json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/json/__main__.py,sha256=wqpkN_NsQyNwKW4qjVj8ADJ4_C98KhrFBtE-Z1UamfU,168
 omdev/tools/json/cli.py,sha256=EubIMT-n2XsjWBZjSy2fWXqijlwrIhLsfbkg3SZzi28,9586
-omdev/tools/json/formats.py,sha256=S8O0-A2_b_kXUevBme4KlSG0V5Nl-WXp8emRub1zMmA,1753
+omdev/tools/json/formats.py,sha256=RgtPdcs294o9n9czjafHppg1iSzD-olsIc3v8ApM9Os,1908
 omdev/tools/json/io.py,sha256=sfj2hJS9Hy3aUR8a_lLzOrYcmL9fSKyvOHiofdUASsI,1427
 omdev/tools/json/parsing.py,sha256=YOeTRY6Gd89EfcHvqXO5PRWJ3IgRCpNnI54Lb_N3v2k,2183
 omdev/tools/json/processing.py,sha256=iFm5VqaxJ97WHaun2ed7NEjMxhFeJqf28bLNfoDJft0,1209
@@ -211,9 +211,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev215.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev215.dist-info/METADATA,sha256=oNR4sVjlhZ4v-B5bp8h4XPFlDnI8aniDWCUq9WLk-ZM,1638
-omdev-0.0.0.dev215.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omdev-0.0.0.dev215.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev215.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev215.dist-info/RECORD,,
+omdev-0.0.0.dev217.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev217.dist-info/METADATA,sha256=lNWmIe7pfG4nlRGuyYkGYlDR5GbC5JBbwrLMiHFIfNk,1638
+omdev-0.0.0.dev217.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omdev-0.0.0.dev217.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev217.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev217.dist-info/RECORD,,