omdev 0.0.0.dev399__py3-none-any.whl → 0.0.0.dev401__py3-none-any.whl

omdev/.manifests.json

@@ -224,7 +224,7 @@
     "module": ".py.findimports",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/findimports.py",
-    "line": 89,
+    "line": 136,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/findimports",
@@ -236,7 +236,7 @@
     "module": ".py.scripts.execstat",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/scripts/execstat.py",
-    "line": 82,
+    "line": 84,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/execstat",
@@ -248,7 +248,7 @@
     "module": ".py.scripts.importtrace",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/scripts/importtrace.py",
-    "line": 490,
+    "line": 491,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/importtrace",

omdev/ci/utils.py

@@ -7,7 +7,7 @@ import typing as ta
 
 
 def read_yaml_file(yaml_file: str) -> ta.Any:
-    yaml = __import__('yaml')
+    import yaml  # noqa
 
     with open(yaml_file) as f:
         return yaml.safe_load(f)

omdev/cli/main.py

@@ -13,7 +13,8 @@ import typing as ta
 
 from omlish import check
 from omlish.lite.cached import cached_nullary
-from omlish.manifests.globals import MANIFEST_LOADER
+from omlish.manifests.globals import GlobalManifestLoader
+from omlish.manifests.loading import ManifestLoader
 
 from .types import CliCmd
 from .types import CliFunc
@@ -183,16 +184,18 @@ def _build_arg_parser() -> argparse.ArgumentParser:
 
 
 def _build_cmd_set(args: ta.Any) -> CliCmdSet:
-    ldr = MANIFEST_LOADER.from_entry_point(
-        globals(),
-        cls_instantiator=MANIFEST_LOADER.instantiate_cls,
+    ldr = ManifestLoader(
+        **ManifestLoader.kwargs_from_entry_point(
+            globals(),
+            **GlobalManifestLoader.default_kwargs(),
+        ),
     )
 
     #
 
-    pkgs = ldr.scan_or_discover_pkgs(
-        specified_roots=args.cli_pkg_root,
-        fallback_root=os.getcwd(),
+    pkgs = ldr.scan_or_discover_packages(
+        specified_root_dirs=args.cli_pkg_root,
+        fallback_root_dir=os.getcwd(),
     )
 
     #
@@ -200,7 +203,7 @@ def _build_cmd_set(args: ta.Any) -> CliCmdSet:
     lst: list[CliCmd] = []
 
     for m in ldr.load(*pkgs, only=[CliModule]):
-        lst.append(check.isinstance(m.value, CliModule))
+        lst.append(check.isinstance(m.value(), CliModule))
 
     lst.extend(_CLI_FUNCS)
 

omdev/dataclasses/codegen.py

@@ -7,6 +7,7 @@ TODO:
  - !! manifests for dataclass config?
   - more sparse / diffuse intent, not package-level
 """
+import importlib
 import logging
 import os.path
 import typing as ta
@@ -46,7 +47,6 @@ class DataclassCodeGen:
         sub_pkgs = sorted(lang.yield_importable(
             pkg_root,
             recursive=True,
-            include_special=True,
         ))
 
         for sub_pkg in sub_pkgs:
@@ -62,7 +62,7 @@ class DataclassCodeGen:
             with processing_options_context(CodegenProcessingOption(callback)):
                 print(f'{sub_pkg=}')
                 try:
-                    __import__(sub_pkg)
+                    importlib.import_module(sub_pkg)
                 except ImportError as e:
                     print(repr(e))
 

omdev/manifests/building.py

@@ -9,6 +9,10 @@ TODO:
  - is this lite? or not?
  - can this run externally? or not? what does it have to import?
   - has to import manifest classes, but not modules with manifest magics
+ - !! can make lite / amalg / embeddable with 'manifest base class markers':
+  - rather than issubclass(cls, ModAttrManifest), can do if cls.__omlish_manifest_class__ == 'mod_attr'
+   - reject unknowns
+   - can analyze statically
 
 See (entry_points):
  - https://github.com/pytest-dev/pluggy/blob/main/src/pluggy/_manager.py#L405
@@ -37,7 +41,7 @@ from omlish.lite.imports import import_attr
 from omlish.lite.json import json_dumps_pretty
 from omlish.lite.logs import log
 from omlish.manifests.base import ModAttrManifest
-from omlish.manifests.globals import MANIFEST_LOADER
+from omlish.manifests.globals import GlobalManifestLoader
 from omlish.manifests.types import Manifest
 from omlish.manifests.types import ManifestOrigin
 
@@ -427,5 +431,5 @@ def check_package_manifests(
         [(key, value_dct)] = manifest.value.items()
         if key.startswith('$.'):
             key = f'${name}{key[1:]}'
-        cls = MANIFEST_LOADER.load_cls(key)
-        value = MANIFEST_LOADER.instantiate_cls(cls, **value_dct)  # noqa
+        cls = GlobalManifestLoader.instance()._load_class(key)  # noqa
+        value = GlobalManifestLoader.instance()._instantiate_value(cls, **value_dct)  # noqa

omdev/oci/tars.py

@@ -92,10 +92,12 @@ class OciDataTarWriter(ExitStacked):
             )
 
         elif self._compression is OciCompression.ZSTD:
-            zc = __import__('zstandard').ZstdCompressor(
+            import zstandard  # noqa
+
+            zc = zstandard.ZstdCompressor(
                 level=self._zstd_level,
             )
-            self._cf = self._enter_context(zc.stream_writer(self._cw))
+            self._cf = self._enter_context(zc.stream_writer(self._cw))  # type: ignore
 
         elif self._compression is None:
             self._cf = self._cw  # type: ignore

omdev/precheck/manifests.py

@@ -1,7 +1,7 @@
 import dataclasses as dc
 import typing as ta
 
-from omlish.manifests.globals import MANIFEST_LOADER
+from omlish.manifests.globals import GlobalManifestLoader
 
 from .base import Precheck
 from .base import PrecheckContext
@@ -23,6 +23,6 @@ class ManifestsPrecheck(Precheck['ManifestsPrecheck.Config']):
     async def run(self) -> ta.AsyncGenerator[Precheck.Violation]:
         for src_root in sorted(self._context.src_roots):
             try:
-                MANIFEST_LOADER.load(src_root)
+                GlobalManifestLoader.load(src_root)
             except Exception as e:  # noqa
                 yield Precheck.Violation(self, f'Error loading manifest for {src_root}: {e!r}')

omdev/precheck/scripts.py

@@ -41,7 +41,19 @@ class ScriptDepsPrecheck(Precheck['ScriptDepsPrecheck.Config']):
             if not src.startswith('#!/usr/bin/env python3\n'):
                 yield Precheck.Violation(self, f'script {fp} lacks correct shebang')
 
-            imps = findimports.find_imports(fp)
-            deps = findimports.get_import_deps(imps)
+            deps: set[str] = set()
+
+            imp_finder = findimports.ImportFinder()
+            for imp in imp_finder.yield_file_imports(fp):
+                # FIXME: lame
+                if imp.line and 'noqa' in [p.strip() for p in imp.line.split('#')]:
+                    continue
+
+                if (imp_tgts := imp_finder.get_import_node_targets(imp.node)) is None:
+                    continue
+
+                imp_deps = imp_finder.get_import_deps(imp_tgts)
+                deps.update(imp_deps)
+
             if deps:
                 yield Precheck.Violation(self, f'script {fp} has deps: {deps}')

omdev/py/findimports.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # @omlish-script
 """
+Note: Not lite as supporting old ast grammars is annoying and a non-goal.
+
 TODO:
  - !! FIX: from omlish import lang - try lang as a subpackage
  - multiple commands:
@@ -8,6 +10,7 @@ TODO:
  - graphviz
 """
 import ast
+import dataclasses as dc
 import importlib.machinery
 import importlib.util
 import os.path
@@ -18,69 +21,113 @@ import typing as ta
 ##
 
 
-_BUILTIN_MODULE_NAMES = frozenset([*sys.builtin_module_names, *sys.stdlib_module_names])
+class ImportFinder:
+    def __init__(
+            self,
+            *,
+            builtin_module_names: ta.AbstractSet[str] | None = None,
+    ) -> None:
+        super().__init__()
+
+        if builtin_module_names is None:
+            builtin_module_names = self.DEFAULT_BUILTIN_MODULE_NAMES
+        self._builtin_module_names = builtin_module_names
 
+        self._whichmod_cache: dict[str, ta.Any] = {}
 
-def whichmod(i: str) -> ta.Literal['bad', 'builtin', 'dep']:
-    try:
-        l = importlib.util.find_spec(i)
-    except (ImportError, ValueError):
-        return 'bad'
+    #
 
-    if not isinstance(l, importlib.machinery.ModuleSpec) or not l.origin:
-        return 'bad'
+    @dc.dataclass(frozen=True)
+    class Import:
+        fp: str
+        node: ast.AST
+        line: str | None
 
-    # if l.origin.startswith(sys.base_prefix) or l.origin == 'frozen':
-    #     return 'builtin'
+    def yield_file_imports(self, fp: str) -> ta.Iterator[Import]:
+        # if not os.path.isfile(os.path.join(os.path.dirname(fp), '__init__.py')):
+        #     return
 
-    if i in _BUILTIN_MODULE_NAMES:
-        return 'builtin'
+        with open(fp) as f:
+            buf = f.read()
 
-    return 'dep'
+        lines = buf.splitlines(keepends=True)
 
+        for node in ast.walk(ast.parse(buf)):
+            if isinstance(node, (ast.Import, ast.ImportFrom)):
+                yield ImportFinder.Import(
+                    fp,
+                    node,
+                    lines[node.lineno - 1] if node.lineno is not None else None,
+                )
 
-def yield_imports(fp: str) -> set[str]:
-    # if not os.path.isfile(os.path.join(os.path.dirname(fp), '__init__.py')):
-    #     return
+    def yield_imports(self, *rootps: str) -> ta.Iterator[Import]:
+        for rootp in rootps:
+            if os.path.isfile(rootp):
+                if rootp.endswith('.py'):
+                    yield from self.yield_file_imports(os.path.join(os.path.dirname(rootp), os.path.basename(rootp)))
 
-    with open(fp) as f:
-        buf = f.read()
+            else:
+                for dp, dns, fns in os.walk(os.path.expanduser(rootp)):  # noqa
+                    for fn in fns:
+                        if fn.endswith('.py'):
+                            yield from self.yield_file_imports(os.path.join(dp, fn))
 
-    nodes: list[ast.AST] = []
+    #
 
-    def rec(n):
-        nodes.append(n)
-        for c in ast.iter_child_nodes(n):
-            rec(c)
+    def get_import_node_targets(self, node: ast.AST) -> set[str] | None:
+        if isinstance(node, ast.Import):
+            return {na.name for na in node.names}
 
-    rec(ast.parse(buf))
+        elif isinstance(node, ast.ImportFrom):
+            return {node.module} if node.module and not node.level else set()
 
-    return {
-        *(na.name for i in nodes if isinstance(i, ast.Import) for na in i.names),
-        *(i.module for i in nodes if isinstance(i, ast.ImportFrom) if i.module and not i.level),
-    }
+        else:
+            return None
 
+    def find_import_targets(self, *rootps: str) -> set[str]:
+        ret: set[str] = set()
+        for imp in self.yield_imports(*rootps):
+            if (imp_tgts := self.get_import_node_targets(imp.node)):
+                ret.update(imp_tgts)
+        return ret
 
-def find_imports(*rootps: str) -> set[str]:
-    imps: set[str] = set()
+    #
 
-    for rootp in rootps:
-        if os.path.isfile(rootp):
-            if rootp.endswith('.py'):
-                imps.update(yield_imports(os.path.join(os.path.dirname(rootp), os.path.basename(rootp))))
+    DEFAULT_BUILTIN_MODULE_NAMES: ta.ClassVar[ta.AbstractSet[str]] = frozenset([
+        *sys.builtin_module_names,
+        *sys.stdlib_module_names,
+    ])
 
-        else:
-            for dp, dns, fns in os.walk(os.path.expanduser(rootp)):  # noqa
-                for fn in fns:
-                    if fn.endswith('.py'):
-                        imps.update(yield_imports(os.path.join(dp, fn)))
+    def _whichmod(self, i: str) -> ta.Literal['bad', 'builtin', 'dep']:
+        try:
+            l = importlib.util.find_spec(i)
+        except (ImportError, ValueError):
+            return 'bad'
+
+        if not isinstance(l, importlib.machinery.ModuleSpec) or not l.origin:
+            return 'bad'
+
+        # if l.origin.startswith(sys.base_prefix) or l.origin == 'frozen':
+        #     return 'builtin'
+
+        if i in self._builtin_module_names:
+            return 'builtin'
+
+        return 'dep'
 
-    return imps
+    def whichmod(self, i: str) -> ta.Literal['bad', 'builtin', 'dep']:
+        try:
+            return self._whichmod_cache[i]
+        except KeyError:
+            pass
 
+        ret = self._whichmod(i)
+        self._whichmod_cache[i] = ret
+        return ret
 
-def get_import_deps(imps: set[str]) -> set[str]:
-    eimps = {n for n in imps for n in [n.split('.')[0]] if n not in sys.builtin_module_names}
-    return {i for i in eimps if whichmod(i) != 'builtin'}
+    def get_import_deps(self, imps: set[str]) -> set[str]:
+        eimps = {n for n in imps for n in [n.split('.')[0]] if n not in sys.builtin_module_names}
+        return {i for i in eimps if self.whichmod(i) != 'builtin'}
 
 
 ##
@@ -95,8 +142,9 @@ _CLI_MODULE = {'$omdev.cli.types.CliModule': {
 
 if __name__ == '__main__':
     def _main() -> None:
-        imps = find_imports(*sys.argv[1:])
-        deps = get_import_deps(imps)
+        imp_finder = ImportFinder()
+        imps = imp_finder.find_import_targets(*sys.argv[1:])
+        deps = imp_finder.get_import_deps(imps)
         print(chr(10).join(sorted(deps)))
 
     _main()

omdev/py/scripts/execstat.py

@@ -36,8 +36,10 @@ def _run(
 
     #
 
+    ns: dict = {}
+
     if setup:
-        exec(setup)
+        exec(setup, globals(), ns)
 
     code = compile(src, '', 'exec')
 
@@ -54,7 +56,7 @@ def _run(
 
     #
 
-    exec(code)
+    exec(code, globals(), ns)
 
     #
 

omdev/py/scripts/importtrace.py

@@ -3,6 +3,7 @@
 # ruff: noqa: UP006 UP007 UP045
 """
 TODO:
+ - !! amalg !!
  - hoist first stacktrace file to a full field
  - no psutil on lin / togglable on mac
  - create table paths(path varchar(1024); - norm, dedupe, index, etc (bonus points for 32bit key)

omdev/scripts/ci.py

@@ -237,7 +237,7 @@ class ShellCmd:
 
 
 def read_yaml_file(yaml_file: str) -> ta.Any:
-    yaml = __import__('yaml')
+    import yaml  # noqa
 
     with open(yaml_file) as f:
         return yaml.safe_load(f)
@@ -7793,10 +7793,12 @@ class OciDataTarWriter(ExitStacked):
             )
 
         elif self._compression is OciCompression.ZSTD:
-            zc = __import__('zstandard').ZstdCompressor(
+            import zstandard  # noqa
+
+            zc = zstandard.ZstdCompressor(
                 level=self._zstd_level,
             )
-            self._cf = self._enter_context(zc.stream_writer(self._cw))
+            self._cf = self._enter_context(zc.stream_writer(self._cw))  # type: ignore
 
         elif self._compression is None:
             self._cf = self._cw  # type: ignore

omdev/tools/git/messages.py

@@ -54,10 +54,10 @@ class StaticGitMessageGeneratorManifest(StaticModAttrManifest, GitMessageGenerat
 
 @cached.function
 def load_message_generator_manifests() -> ta.Sequence[GitMessageGeneratorManifest]:
-    ldr = manifest_globals.MANIFEST_LOADER
-    pkgs = ldr.scan_or_discover_pkgs(fallback_root=os.getcwd())
+    ldr = manifest_globals.GlobalManifestLoader.instance()
+    pkgs = ldr.scan_or_discover_packages(fallback_root_dir=os.getcwd())
     mfs = ldr.load(*pkgs, only=[GitMessageGeneratorManifest])
-    return [mf.value for mf in mfs]
+    return [mf.value() for mf in mfs]
 
 
 @cached.function

{omdev-0.0.0.dev399.dist-info → omdev-0.0.0.dev401.dist-info}/METADATA

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

{omdev-0.0.0.dev399.dist-info → omdev-0.0.0.dev401.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=vqg148YzWHn61WpGqC2PuTiOIR2HcH5O55XZZGTcnVw,12452
+omdev/.manifests.json,sha256=oCm2YooCueFdF1vxjY3VXUVdcdJSUf7j5PxXeB4rEgY,12453
 omdev/__about__.py,sha256=fQNmzSa1MntcPSrzg_Vpo6JRU2RbXik2NqRz0oQCApE,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
@@ -79,7 +79,7 @@ omdev/ci/consts.py,sha256=HkSYz-_hHilcHPBvRs-SwcUxW7vMNlHXZ8OyIKnVQbQ,21
 omdev/ci/inject.py,sha256=Yk7bT7sRC76PUN9qQ07MiveAuQmi1LZBKxah7VKOB5Q,1930
 omdev/ci/requirements.py,sha256=oDk-xEj-woNHElVQ0RbHWvG7mN-_2IopkpFLQU4QyTs,2111
 omdev/ci/shell.py,sha256=YzYqIgRbSaScgSyMwaM-HP54B3HQW0dPr0mXhdsB-70,841
-omdev/ci/utils.py,sha256=NHbac08-TfG9uIrIWe2a6ES-KEsLwMXOBdnMOFNyHTI,310
+omdev/ci/utils.py,sha256=vedSrhoHKZdhzIkVUrQgETz8ox60UGewKw1qjNQ090w,304
 omdev/ci/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/ci/docker/buildcaching.py,sha256=ge6TOKkffqVJMHMPJJl4sWy7hOkUeXgjmfq2cVJEsus,1839
 omdev/ci/docker/cache.py,sha256=Psk9EX9iDJ2Fk-tDGzbBa4TD8xgucroGoY_AErjgzDo,2120
@@ -113,7 +113,7 @@ omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=UshIZX3oeXq0De-9X28gy2LgKMZDf_dzabdkUhZJdNA,2124
 omdev/cli/clicli.py,sha256=TZnQYHyyh97B6N_pVYYduYgt03s8Yp5mrJ7wblXWSWY,6308
 omdev/cli/install.py,sha256=oB34AOwu07sqEztW_z5mgorAFoP_Tw556XiTPj2WSM0,4904
-omdev/cli/main.py,sha256=M3r8ARUKJbI3U7xVNI6a1i64YWBkt-NNC8jTJzCYUOE,6772
+omdev/cli/main.py,sha256=eUvc64Wi6ROcSG7V_yzrmhpY2CgR12cyz9eJGXE0xlI,6885
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
 omdev/cli/types.py,sha256=SH88B81otsSYNM-PM3Ry1wgLLvyg2M6fBJkWOajWIWM,485
 omdev/clipboard/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -128,7 +128,7 @@ omdev/cmdlog/cmdlog.py,sha256=MJqfCG7sVWjSK_i1shD7cgWpFZXZkPvGhGEh-yd6iwM,1982
 omdev/dataclasses/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/dataclasses/__main__.py,sha256=N-a0Lf_s7D0VajuZCCY_dt8R4rSpeck9inbCsoIvciQ,175
 omdev/dataclasses/cli.py,sha256=j5GfpJQSkA_jmV94XTVb3amCFYjgrasMs-bp_zJEkqE,445
-omdev/dataclasses/codegen.py,sha256=T9SYsTjmNrM1HMUFVMO46-Szd3DH0Em0B-I_UTan6qg,3029
+omdev/dataclasses/codegen.py,sha256=sxWe791RvRQqqBTofwiEknbT7XV2TZHTXuR6FbR3zzU,3025
 omdev/dataserver/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/dataserver/handlers.py,sha256=YTuRfZehP9panTwq8dPReHZwXF1_fFIueh-_ZoztA98,5446
 omdev/dataserver/http.py,sha256=SMS6w-GVevG58FypqmPytcEqW8aUWpd2_F6JlBDIuBc,1730
@@ -182,7 +182,7 @@ omdev/magic/styles.py,sha256=6LAL7XR3fkkH2rh-8nwUvdCYVHBkQxCfP0oEuPuw1Bg,670
 omdev/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/manifests/__main__.py,sha256=JqyVDyV7_jo-NZ3wSs5clDU_xCMlxzJv-XFohoZWQ7E,174
 omdev/manifests/_dumping.py,sha256=RyphKkXhTnb8zWqcWjAR-GN8vNbBM9-PrZ3fJEvF1RE,44230
-omdev/manifests/building.py,sha256=e1cNN3wPrINlRROu2hW8W9Jz0PmIByZCD5RvoNr-J8Y,13287
+omdev/manifests/building.py,sha256=O-SBzMfqXAfLVunQJ29fzV6zCaMrrM3lVpf7iFHCxuM,13568
 omdev/manifests/dumping.py,sha256=WF911eYL3LT6powrQT3w83XIM_RdExDgTSsGiNomSIo,4506
 omdev/manifests/main.py,sha256=mYb8iM5bdwaO8jSd9_hIBSoYLf2h7e0iLb9aCCbgJ6c,2175
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -197,7 +197,7 @@ omdev/oci/dataserver.py,sha256=YGYrVW2X3rwa4i0FudfjGeZl39F2dDNPnoGH9xOZMhI,1869
 omdev/oci/loading.py,sha256=ZKy2x-j0KkpyAt4zlslSOP5mk9UBxNMQWMGu9TygoXA,3861
 omdev/oci/media.py,sha256=lI8b-zw3OPXx_y9m0uqeqb38MWE5sdzVWHrafwl1hlY,5357
 omdev/oci/repositories.py,sha256=SG31QBMuMCuC9gJCUKmxG6O_Anze9XF1aTsV_zEvMxI,4519
-omdev/oci/tars.py,sha256=LgC72-Hw-z-v9NRZkuPQg9UB-pxo_zIXA-SEG56I1Bk,3368
+omdev/oci/tars.py,sha256=UCO1y8zoZMBOg6DOvw7dtMs3W9PVGRQ-bIvf349PFDk,3408
 omdev/oci/pack/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/oci/pack/packing.py,sha256=zsvQN-VD-7MaMjiylUpg_jXicp1YDbtyUktrR7ek6Ug,5419
 omdev/oci/pack/repositories.py,sha256=Ogh4Wj2ySvIMnuDFb2OeBc67hHtc0WWkAfBxOkNE5aA,4954
@@ -218,8 +218,8 @@ omdev/precheck/git.py,sha256=O8rNQZ_vlHec0pOFbK6LOkbly5ZIUYT_HXRMqQX8GaI,774
 omdev/precheck/imports.py,sha256=3loQxHMrpI0ce4-le77NCSxutLac_5vDW4UDX7KWWg8,2565
 omdev/precheck/lite.py,sha256=qd6nXWEVut8aBSRD_NxnxXGRNa9ue8mu8ND8rGLisE4,4710
 omdev/precheck/main.py,sha256=_1A5wiu9p2th1dn_17w1ZIFtMmCIOaTFpWyvK0jopEA,4374
-omdev/precheck/manifests.py,sha256=96deAjSGCqKPJz8sAqzx8YY3SCbMzO9v-hytfxPPDJU,789
-omdev/precheck/scripts.py,sha256=244Jq5xee2QErn0gvpt0hmdYg95TYtuefMDXaE9YPws,1344
+omdev/precheck/manifests.py,sha256=5Hlo_3BF5HbcLPxn93fhDS9yy9k6iL2vFsqFNfoU9q4,799
+omdev/precheck/scripts.py,sha256=6nb_lDgyX7u9kdF_BU6ubY01q_jGk96VH9q9gpOieng,1753
 omdev/precheck/unicode.py,sha256=VUNDCrlfUas_U8ugV_q0eFUXuBgKjS8YdCFm0FXREXo,2583
 omdev/ptk/__init__.py,sha256=4zhIfvhebFj4TJRRN1SQkcAe-7elizcfZLsD-fIlZsI,5198
 omdev/ptk/confirm.py,sha256=11MJArDEMSm7L1Qx68B07Qfsu43_ACyk48tbub7P9jk,1611
@@ -239,7 +239,7 @@ omdev/py/__init__.py,sha256=u7tLEfRTnPVtWPmKK_ZIvnFkZwTe1q44UQ53cvsix3k,41
 omdev/py/attrdocs.py,sha256=FcMSUFw8_zyNYducsWnZKEKi_WDox3-b3Xjw0DrHUcs,5180
 omdev/py/bracepy.py,sha256=PPPoTMj4FJ5Lk3GGPEEWBGU7Kl1eCJBApSJnRvRj2Ms,2753
 omdev/py/classdot.py,sha256=CAHL39nhQWnELVe1L6HIOyLha2h3pf4f1vKyLZTHhkM,1666
-omdev/py/findimports.py,sha256=V3GcFhqYOiPQtAOpTi4Pmeb3_c5mKqlEwah7v9vCBjg,2476
+omdev/py/findimports.py,sha256=-ADbdLAFKW05lMwHxT8bf0hZsKFW8XJLoG-5oVRlK2g,4246
 omdev/py/srcheaders.py,sha256=cMopJr-QpOmzEBow-4mVupxdULE8QdSaSLH2aJV5Xxg,1993
 omdev/py/docstrings/LICENSE,sha256=xcpUBjP2UnH0P7dk-v45ilWGJr0Ydn0vgMvGReKMTVA,1084
 omdev/py/docstrings/__init__.py,sha256=HFzqco1oj6M7KQ80i48W9gYABVJU8oM_1wpl9ndBNAA,413
@@ -252,8 +252,8 @@ omdev/py/docstrings/parser.py,sha256=umJEgQBkSXLwWIKZrBbFCfNrz847vpTNDqTTEwlvHpA
 omdev/py/docstrings/rest.py,sha256=c2xPYg_W01W9eYY_KLKX69E4qu4jpkgUshi5K5EyVv8,5221
 omdev/py/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/py/scripts/bumpversion.py,sha256=UDMtTd_wfkqsmrtHqTKDilWVzUBigzZAOCVND7t9jyw,1124
-omdev/py/scripts/execstat.py,sha256=eyk_TCeJt-xtMGqaW3X7pnEBe7JZbXrTYsODn_m6lfM,3869
-omdev/py/scripts/importtrace.py,sha256=F5K7ZH57S2kekigDZBXpuDjm8HgozfEQ39BNCjkmUrE,14241
+omdev/py/scripts/execstat.py,sha256=eeOJ6LcNi-SS-EJKPubuHNvUbEnbqouliWvz6fjwjwM,3918
+omdev/py/scripts/importtrace.py,sha256=Plh2ixN8NxTekrNoac6l9wg9B4x1647sEOvQTSy_Hbk,14256
 omdev/py/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/py/tools/importscan.py,sha256=4dCH0coX0OqNwesteKaTE8GxuSfLhgXYQlzNUXLiSNY,4640
 omdev/py/tools/mkrelimp.py,sha256=kuzfS4GWcGi-ItyhEHSW4hV9ZcfDJL6inDMhDp1V2lE,4049
@@ -270,7 +270,7 @@ omdev/pyproject/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQo04dR1czcc,838
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
-omdev/scripts/ci.py,sha256=sReH_mR0BiE3-KPBD2VVEyKrUJNJhcTF0oeSm7pmyyg,362502
+omdev/scripts/ci.py,sha256=0a_DmI9q44dl9wvE64IvJwbMICVFC0O5cj3LCZC5EJs,362536
 omdev/scripts/interp.py,sha256=2xNG-ObiPC-F5eV_nTHq2u-V3Hyuo_6KblPFCBhm2mA,158487
 omdev/scripts/pyproject.py,sha256=DL5q2gsnGChTTuzSHn1PprW2kl3ti_K60JXnKLZdA40,269992
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
@@ -303,7 +303,7 @@ omdev/tools/git/__main__.py,sha256=gI87SBUgTkKUcUM-RtZWnei-UUDDqzbr5aPztb-gvbE,1
 omdev/tools/git/cli.py,sha256=I4AiCTz4OCzK6s8J2TJF1eYw9FH2JIK_CsdjQH_9UTE,16757
 omdev/tools/git/cloning.py,sha256=CNGBBMoWaTBJW4SZTf1VvhDFSm0yg7qDfNwZun_PFbU,891
 omdev/tools/git/consts.py,sha256=JuXivUNDkNhM4pe97icjRVAKM8cNRbrODquHINNKqOE,40
-omdev/tools/git/messages.py,sha256=yYJL8O3d2DJbtH0C850Dx5u7Wo9zhiX_ijKFpWnVRow,2433
+omdev/tools/git/messages.py,sha256=ZZuDMDGnMo3se-EE2mJbRDOFlaIBUBT6fMX0DRG9yD8,2459
 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=8aXX3ijU3lvPZamkIyUOz-vlBmyIdaX7dCQq5rN7adE,10193
@@ -321,9 +321,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 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=ao5mdrpiSU4AZ8mBozoEaV3UVlmVTnRG9wD9XP70MZE,11429
-omdev-0.0.0.dev399.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev399.dist-info/METADATA,sha256=dEV0PwLxb7R9HiWtfC3iWyOahEQy97cSp4LcJbxzke8,5094
-omdev-0.0.0.dev399.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev399.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev399.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev399.dist-info/RECORD,,
+omdev-0.0.0.dev401.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev401.dist-info/METADATA,sha256=RLScNFrnOubL8SappIzdHqIWaA3uKwZ8kK0S_5o3XrA,5094
+omdev-0.0.0.dev401.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev401.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev401.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev401.dist-info/RECORD,,