omdev 0.0.0.dev428__py3-none-any.whl → 0.0.0.dev430__py3-none-any.whl

omdev/.omlish-manifests.json

@@ -27,7 +27,7 @@
     "module": ".cexts.cmake",
     "attr": "_CLI_MODULE",
     "file": "omdev/cexts/cmake.py",
-    "line": 333,
+    "line": 332,
     "value": {
       "!.cli.types.CliModule": {
         "name": "cmake",
@@ -284,7 +284,7 @@
     "module": ".py.tools.mkrelimp",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/tools/mkrelimp.py",
-    "line": 149,
+    "line": 148,
     "value": {
       "!.cli.types.CliModule": {
         "name": "py/mkrelimp",

omdev/amalg/cli/main.py

@@ -26,7 +26,6 @@ Targets:
  - supervisor?
 """
 import argparse
-import logging
 import os.path
 import stat
 import typing as ta
@@ -38,7 +37,7 @@ from ..gen.gen import SCAN_COMMENT
 from ..gen.gen import AmalgGenerator
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

omdev/cache/data/cache.py

@@ -11,7 +11,6 @@ TODO:
  - download resume ala hf_hub
 """
 import contextlib
-import logging
 import os.path
 import shutil
 import subprocess
@@ -25,6 +24,7 @@ from omlish import check
 from omlish import lang
 from omlish import marshal as msh
 from omlish.formats import json
+from omlish.logs import all as logs
 from omlish.os.files import touch
 
 from ...git.shallow import git_shallow_clone
@@ -37,7 +37,7 @@ from .specs import Spec
 from .specs import UrlSpec
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

omdev/cexts/_distutils/build_ext.py

@@ -37,7 +37,6 @@ License Agreement.
 """
 import contextlib
 import dataclasses as dc
-import logging
 import os
 import site
 import sys
@@ -46,6 +45,7 @@ import typing as ta
 from omlish import cached
 from omlish import check
 from omlish import lang
+from omlish.logs import all as logs
 
 from . import compilers
 from . import errors
@@ -55,7 +55,10 @@ from . import sysconfig
 from . import util
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
+
+
+##
 
 
 def _get_str_config_var(name: str) -> str:

omdev/cexts/_distutils/compilers/ccompiler.py

@@ -1,7 +1,6 @@
 """
 Contains CCompiler, an abstract base class that defines the interface for the Distutils compiler abstraction model.
 """
-import logging
 import os
 import re
 import sys
@@ -9,6 +8,7 @@ import typing as ta
 import warnings
 
 from omlish import check
+from omlish.logs import all as logs
 
 from ..dir_util import mkpath
 from ..errors import CompileError
@@ -25,7 +25,10 @@ from .options import Macro
 from .options import gen_preprocess_options
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
+
+
+##
 
 
 class CCompiler:

omdev/cexts/_distutils/compilers/options.py

@@ -4,6 +4,9 @@ import typing as ta
 from ..util import always_iterable
 
 
+##
+
+
 Macro: ta.TypeAlias = tuple[str, str | None] | tuple[str]
 
 

omdev/cexts/_distutils/compilers/unixccompiler.py

@@ -14,13 +14,14 @@ from __future__ import annotations
 
 import importlib
 import itertools
-import logging
 import os
 import re
 import shlex
 import sys
 import typing as ta
 
+from omlish.logs import all as logs
+
 from .. import sysconfig
 from ..errors import CompileError
 from ..errors import DistutilsExecError
@@ -32,7 +33,10 @@ from .options import gen_lib_options
 from .options import gen_preprocess_options
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
+
+
+##
 
 
 def bypass_compiler_fixup(cmd, args):

omdev/cexts/_distutils/dir_util.py

@@ -1,13 +1,17 @@
 """Utility functions for manipulating directories and directory trees."""
 import errno
-import logging
 import os
 
+from omlish.logs import all as logs
+
 from .errors import DistutilsFileError
 from .errors import DistutilsInternalError
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
+
+
+##
 
 
 # cache for by mkpath() -- in addition to cheapening redundant calls, eliminates redundant "creating /foo/bar/baz"

omdev/cexts/_distutils/errors.py

@@ -8,6 +8,9 @@ end with "Error".
 """
 
 
+##
+
+
 class DistutilsError(Exception):
     """The root of all Distutils evil."""
 

omdev/cexts/_distutils/extension.py

@@ -2,6 +2,9 @@
 import warnings
 
 
+##
+
+
 class Extension:
     """
     Just a collection of attributes that describes an extension module and everything needed to build it (hopefully in a

omdev/cexts/_distutils/file_util.py

@@ -1,12 +1,16 @@
 """Utility functions for operating on single files."""
 import contextlib
-import logging
 import os
 
+from omlish.logs import all as logs
+
 from .errors import DistutilsFileError
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
+
+
+##
 
 
 # for generating verbose output in 'copy_file()'

omdev/cexts/_distutils/modified.py

@@ -4,6 +4,9 @@ import os.path
 from .errors import DistutilsFileError
 
 
+##
+
+
 def _newer(source, target):
     return not os.path.exists(target) or (os.path.getmtime(source) > os.path.getmtime(target))
 

omdev/cexts/_distutils/spawn.py

@@ -4,15 +4,19 @@ specific functions for launching another program in a sub-process.
 Also provides the 'find_executable()' to search the path for a given
 executable name.
 """
-import logging
 import os
 import subprocess
 import sys
 
+from omlish.logs import all as logs
+
 from .errors import DistutilsExecError
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
+
+
+##
 
 
 def spawn(cmd, search_path=1, verbose=0, dry_run=False, env=None, debug=False):  # noqa: C901

omdev/cexts/_distutils/sysconfig.py

@@ -16,6 +16,9 @@ from .errors import DistutilsPlatformError
 from .util import pass_none
 
 
+##
+
+
 IS_PYPY = '__pypy__' in sys.builtin_module_names
 
 # These are needed in a couple of spots, so just compute them once.

omdev/cexts/_distutils/util.py

@@ -1,6 +1,5 @@
 """Miscellaneous utility functions -- anything that doesn't fit into one of the other *util.py modules."""
 import functools
-import logging
 import os
 import re
 import string
@@ -8,10 +7,15 @@ import sys
 import sysconfig
 import typing as ta
 
+from omlish.logs import all as logs
+
 from .errors import DistutilsPlatformError
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
+
+
+##
 
 
 def pass_none(func):

omdev/cexts/_distutils/version.py

@@ -18,6 +18,9 @@ import re
 import warnings
 
 
+##
+
+
 @contextlib.contextmanager
 def suppress_known_deprecation():
     with warnings.catch_warnings(record=True) as ctx:

omdev/cexts/cmake.py

@@ -33,7 +33,6 @@ Done:
 import argparse
 import dataclasses as dc
 import io
-import logging
 import os.path
 import shutil
 import sys
@@ -50,7 +49,7 @@ from ..cli import CliModule
 from .magic import CextMagic
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

omdev/cexts/scan.py

@@ -1,5 +1,4 @@
 import argparse
-import logging
 import os.path
 import typing as ta
 
@@ -8,7 +7,7 @@ from omlish.logs import all as logs
 from .magic import CextMagic
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

omdev/dataclasses/codegen.py

@@ -8,7 +8,6 @@ TODO:
   - more sparse / diffuse intent, not package-level
 """
 import importlib
-import logging
 import os.path
 import typing as ta
 
@@ -21,9 +20,10 @@ from omlish.dataclasses.impl.generation.processor import Codegen as CodegenProce
 from omlish.dataclasses.impl.generation.processor import GeneratorProcessor
 from omlish.dataclasses.impl.processing.base import ProcessingContext
 from omlish.dataclasses.impl.processing.driving import processing_options_context
+from omlish.logs import all as logs
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

omdev/precheck/lite.py

@@ -2,13 +2,13 @@ import asyncio
 import dataclasses as dc
 import glob
 import inspect
-import logging
 import os.path
 import subprocess
 import textwrap
 import typing as ta
 
 from omlish import cached
+from omlish.logs import all as logs
 from omlish.subprocesses.wrap import subprocess_maybe_shell_wrap_exec
 
 from .. import magic
@@ -16,7 +16,7 @@ from .base import Precheck
 from .base import PrecheckContext
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

omdev/precheck/main.py

@@ -20,7 +20,6 @@ TODO:
 """
 import argparse
 import asyncio
-import logging
 import os.path
 import sys
 import typing as ta
@@ -43,7 +42,7 @@ from .scripts import ScriptDepsPrecheck
 from .unicode import UnicodePrecheck
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

omdev/py/tools/mkrelimp.py

@@ -1,6 +1,5 @@
 import argparse
 import itertools
-import logging
 import os.path
 import typing as ta
 
@@ -13,7 +12,7 @@ from ...tokens import all as tks
 T = ta.TypeVar('T')
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

omdev/scripts/ci.py

@@ -1807,19 +1807,16 @@ def format_num_bytes(num_bytes: int) -> str:
 ##
 
 
-class _LoggingContextInfo:
-    def __mro_entries__(self, bases):
-        return ()
-
-
-LoggingContextInfo: type = ta.cast(ta.Any, _LoggingContextInfo())
+def logging_context_info(cls):
+    return cls
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingSourceFileInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingSourceFileInfo(ta.NamedTuple):
     file_name: str
     module: str
 
@@ -1836,16 +1833,17 @@ class LoggingSourceFileInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[
             return None
 
         return cls(
-            file_name,
-            module,
+            file_name=file_name,
+            module=module,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingThreadInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingThreadInfo(ta.NamedTuple):
     ident: int
     native_id: ta.Optional[int]
     name: str
@@ -1853,31 +1851,33 @@ class LoggingThreadInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc
     @classmethod
     def build(cls) -> 'LoggingThreadInfo':
         return cls(
-            threading.get_ident(),
-            threading.get_native_id() if hasattr(threading, 'get_native_id') else None,
-            threading.current_thread().name,
+            ident=threading.get_ident(),
+            native_id=threading.get_native_id() if hasattr(threading, 'get_native_id') else None,
+            name=threading.current_thread().name,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingProcessInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingProcessInfo(ta.NamedTuple):
     pid: int
 
     @classmethod
     def build(cls) -> 'LoggingProcessInfo':
         return cls(
-            os.getpid(),
+            pid=os.getpid(),
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingMultiprocessingInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingMultiprocessingInfo(ta.NamedTuple):
     process_name: str
 
     @classmethod
@@ -1887,15 +1887,16 @@ class LoggingMultiprocessingInfo(LoggingContextInfo, ta.NamedTuple):  # type: ig
             return None
 
         return cls(
-            mp.current_process().name,
+            process_name=mp.current_process().name,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingAsyncioTaskInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingAsyncioTaskInfo(ta.NamedTuple):
     name: str
 
     @classmethod
@@ -1913,7 +1914,7 @@ class LoggingAsyncioTaskInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore
             return None
 
         return cls(
-            task.get_name(),  # Always non-None
+            name=task.get_name(),  # Always non-None
         )
 
 
@@ -1936,36 +1937,66 @@ class NamedLogLevel(int):
 
     #
 
-    @property
-    def exact_name(self) -> ta.Optional[str]:
-        return self._NAMES_BY_INT.get(self)
+    _CACHE: ta.ClassVar[ta.MutableMapping[int, 'NamedLogLevel']] = {}
+
+    @ta.overload
+    def __new__(cls, name: str, offset: int = 0, /) -> 'NamedLogLevel':
+        ...
 
-    _effective_name: ta.Optional[str]
+    @ta.overload
+    def __new__(cls, i: int, /) -> 'NamedLogLevel':
+        ...
+
+    def __new__(cls, x, offset=0, /):
+        if isinstance(x, str):
+            return cls(cls._INTS_BY_NAME[x.upper()] + offset)
+        elif not offset and (c := cls._CACHE.get(x)) is not None:
+            return c
+        else:
+            return super().__new__(cls, x + offset)
+
+    #
+
+    _name_and_offset: ta.Tuple[str, int]
 
     @property
-    def effective_name(self) -> ta.Optional[str]:
+    def name_and_offset(self) -> ta.Tuple[str, int]:
         try:
-            return self._effective_name
+            return self._name_and_offset
         except AttributeError:
             pass
 
-        if (n := self.exact_name) is None:
+        if (n := self._NAMES_BY_INT.get(self)) is not None:
+            t = (n, 0)
+        else:
             for n, i in self._NAME_INT_PAIRS:  # noqa
                 if self >= i:
+                    t = (n, (self - i))
                     break
             else:
-                n = None
+                t = ('NOTSET', int(self))
 
-        self._effective_name = n
+        self._name_and_offset = t
+        return t
+
+    @property
+    def exact_name(self) -> ta.Optional[str]:
+        n, o = self.name_and_offset
+        return n if not o else None
+
+    @property
+    def effective_name(self) -> str:
+        n, _ = self.name_and_offset
         return n
 
     #
 
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({int(self)})'
-
     def __str__(self) -> str:
-        return self.exact_name or f'{self.effective_name or "INVALID"}:{int(self)}'
+        return self.exact_name or f'{self.effective_name}{int(self):+}'
+
+    def __repr__(self) -> str:
+        n, o = self.name_and_offset
+        return f'{self.__class__.__name__}({n!r}{f", {int(o)}" if o else ""})'
 
     #
 
@@ -1985,6 +2016,9 @@ NamedLogLevel.DEBUG = NamedLogLevel(logging.DEBUG)
 NamedLogLevel.NOTSET = NamedLogLevel(logging.NOTSET)
 
 
+NamedLogLevel._CACHE.update({i: NamedLogLevel(i) for i in NamedLogLevel._NAMES_BY_INT})  # noqa
+
+
 ########################################
 # ../../../omlish/logs/std/filters.py
 
@@ -4952,7 +4986,9 @@ class PredicateTimeout(Timeout):
 ##
 
 
-class LoggingCaller(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+@logging_context_info
+@ta.final
+class LoggingCaller(ta.NamedTuple):
     file_path: str
     line_no: int
     name: str
@@ -5005,10 +5041,10 @@ class LoggingCaller(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
                 sinfo = sinfo[:-1]
 
         return cls(
-            f.f_code.co_filename,
-            f.f_lineno or 0,
-            f.f_code.co_name,
-            sinfo,
+            file_path=f.f_code.co_filename,
+            line_no=f.f_lineno or 0,
+            name=f.f_code.co_name,
+            stack_info=sinfo,
         )
 
 
@@ -5019,6 +5055,7 @@ class LoggingCaller(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
 ##
 
 
+@ta.runtime_checkable
 class LoggerLike(ta.Protocol):
     """Satisfied by both our Logger and stdlib logging.Logger."""
 
@@ -5107,7 +5144,9 @@ class JsonLoggingFormatter(logging.Formatter):
 ##
 
 
-class LoggingTimeFields(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+@logging_context_info
+@ta.final
+class LoggingTimeFields(ta.NamedTuple):
     """Maps directly to stdlib `logging.LogRecord` fields, and must be kept in sync with it."""
 
     created: float
@@ -5155,9 +5194,9 @@ class LoggingTimeFields(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc
         relative_created = (time_ns - start_time_ns) / 1e6
 
         return cls(
-            created,
-            msecs,
-            relative_created,
+            created=created,
+            msecs=msecs,
+            relative_created=relative_created,
         )
 
 
@@ -9432,7 +9471,7 @@ class CoroHttpServer:
 
 class AnyLogger(Abstract, ta.Generic[T]):
     def is_enabled_for(self, level: LogLevel) -> bool:
-        return self.get_effective_level() >= level
+        return level >= self.get_effective_level()
 
     @abc.abstractmethod
     def get_effective_level(self) -> LogLevel:
@@ -9629,7 +9668,7 @@ class AsyncLogger(AnyLogger[ta.Awaitable[None]], Abstract):
 class AnyNopLogger(AnyLogger[T], Abstract):
     @ta.final
     def get_effective_level(self) -> LogLevel:
-        return 999
+        return -999
 
 
 @ta.final
@@ -10010,7 +10049,7 @@ def generate_temp_localhost_ssl_cert() -> TempSslCert:
 
 
 class SocketServer:
-    _DEFAULT_LOGGER = logging.getLogger('.'.join([__name__, 'SocketServer']))
+    _DEFAULT_LOGGER: LoggerLike = logging.getLogger('.'.join([__name__, 'SocketServer']))  # FIXME
 
     def __init__(
             self,
@@ -11132,7 +11171,7 @@ class CoroHttpServerSocketHandler(SocketHandler_):
 
 
 ########################################
-# ../../../omlish/logs/std/adapters.py
+# ../../../omlish/logs/std/loggers.py
 
 
 ##
@@ -11148,6 +11187,9 @@ class StdLogger(Logger):
     def std(self) -> logging.Logger:
         return self._std
 
+    def is_enabled_for(self, level: LogLevel) -> bool:
+        return self._std.isEnabledFor(level)
+
     def get_effective_level(self) -> LogLevel:
         return self._std.getEffectiveLevel()
 

omdev/scripts/interp.py

@@ -1407,36 +1407,66 @@ class NamedLogLevel(int):
 
     #
 
-    @property
-    def exact_name(self) -> ta.Optional[str]:
-        return self._NAMES_BY_INT.get(self)
+    _CACHE: ta.ClassVar[ta.MutableMapping[int, 'NamedLogLevel']] = {}
+
+    @ta.overload
+    def __new__(cls, name: str, offset: int = 0, /) -> 'NamedLogLevel':
+        ...
+
+    @ta.overload
+    def __new__(cls, i: int, /) -> 'NamedLogLevel':
+        ...
+
+    def __new__(cls, x, offset=0, /):
+        if isinstance(x, str):
+            return cls(cls._INTS_BY_NAME[x.upper()] + offset)
+        elif not offset and (c := cls._CACHE.get(x)) is not None:
+            return c
+        else:
+            return super().__new__(cls, x + offset)
+
+    #
 
-    _effective_name: ta.Optional[str]
+    _name_and_offset: ta.Tuple[str, int]
 
     @property
-    def effective_name(self) -> ta.Optional[str]:
+    def name_and_offset(self) -> ta.Tuple[str, int]:
         try:
-            return self._effective_name
+            return self._name_and_offset
         except AttributeError:
             pass
 
-        if (n := self.exact_name) is None:
+        if (n := self._NAMES_BY_INT.get(self)) is not None:
+            t = (n, 0)
+        else:
             for n, i in self._NAME_INT_PAIRS:  # noqa
                 if self >= i:
+                    t = (n, (self - i))
                     break
             else:
-                n = None
+                t = ('NOTSET', int(self))
+
+        self._name_and_offset = t
+        return t
+
+    @property
+    def exact_name(self) -> ta.Optional[str]:
+        n, o = self.name_and_offset
+        return n if not o else None
 
-        self._effective_name = n
+    @property
+    def effective_name(self) -> str:
+        n, _ = self.name_and_offset
         return n
 
     #
 
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({int(self)})'
-
     def __str__(self) -> str:
-        return self.exact_name or f'{self.effective_name or "INVALID"}:{int(self)}'
+        return self.exact_name or f'{self.effective_name}{int(self):+}'
+
+    def __repr__(self) -> str:
+        n, o = self.name_and_offset
+        return f'{self.__class__.__name__}({n!r}{f", {int(o)}" if o else ""})'
 
     #
 
@@ -1456,6 +1486,9 @@ NamedLogLevel.DEBUG = NamedLogLevel(logging.DEBUG)
 NamedLogLevel.NOTSET = NamedLogLevel(logging.NOTSET)
 
 
+NamedLogLevel._CACHE.update({i: NamedLogLevel(i) for i in NamedLogLevel._NAMES_BY_INT})  # noqa
+
+
 ########################################
 # ../../../omlish/logs/std/filters.py
 
@@ -2826,6 +2859,7 @@ class PredicateTimeout(Timeout):
 ##
 
 
+@ta.runtime_checkable
 class LoggerLike(ta.Protocol):
     """Satisfied by both our Logger and stdlib logging.Logger."""
 

omdev/scripts/pyproject.py

@@ -2966,19 +2966,16 @@ def typing_annotations_attr() -> str:
 ##
 
 
-class _LoggingContextInfo:
-    def __mro_entries__(self, bases):
-        return ()
-
-
-LoggingContextInfo: type = ta.cast(ta.Any, _LoggingContextInfo())
+def logging_context_info(cls):
+    return cls
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingSourceFileInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingSourceFileInfo(ta.NamedTuple):
     file_name: str
     module: str
 
@@ -2995,16 +2992,17 @@ class LoggingSourceFileInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[
             return None
 
         return cls(
-            file_name,
-            module,
+            file_name=file_name,
+            module=module,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingThreadInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingThreadInfo(ta.NamedTuple):
     ident: int
     native_id: ta.Optional[int]
     name: str
@@ -3012,31 +3010,33 @@ class LoggingThreadInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc
     @classmethod
     def build(cls) -> 'LoggingThreadInfo':
         return cls(
-            threading.get_ident(),
-            threading.get_native_id() if hasattr(threading, 'get_native_id') else None,
-            threading.current_thread().name,
+            ident=threading.get_ident(),
+            native_id=threading.get_native_id() if hasattr(threading, 'get_native_id') else None,
+            name=threading.current_thread().name,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingProcessInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingProcessInfo(ta.NamedTuple):
     pid: int
 
     @classmethod
     def build(cls) -> 'LoggingProcessInfo':
         return cls(
-            os.getpid(),
+            pid=os.getpid(),
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingMultiprocessingInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingMultiprocessingInfo(ta.NamedTuple):
     process_name: str
 
     @classmethod
@@ -3046,15 +3046,16 @@ class LoggingMultiprocessingInfo(LoggingContextInfo, ta.NamedTuple):  # type: ig
             return None
 
         return cls(
-            mp.current_process().name,
+            process_name=mp.current_process().name,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingAsyncioTaskInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingAsyncioTaskInfo(ta.NamedTuple):
     name: str
 
     @classmethod
@@ -3072,7 +3073,7 @@ class LoggingAsyncioTaskInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore
             return None
 
         return cls(
-            task.get_name(),  # Always non-None
+            name=task.get_name(),  # Always non-None
         )
 
 
@@ -3095,36 +3096,66 @@ class NamedLogLevel(int):
 
     #
 
-    @property
-    def exact_name(self) -> ta.Optional[str]:
-        return self._NAMES_BY_INT.get(self)
+    _CACHE: ta.ClassVar[ta.MutableMapping[int, 'NamedLogLevel']] = {}
+
+    @ta.overload
+    def __new__(cls, name: str, offset: int = 0, /) -> 'NamedLogLevel':
+        ...
 
-    _effective_name: ta.Optional[str]
+    @ta.overload
+    def __new__(cls, i: int, /) -> 'NamedLogLevel':
+        ...
+
+    def __new__(cls, x, offset=0, /):
+        if isinstance(x, str):
+            return cls(cls._INTS_BY_NAME[x.upper()] + offset)
+        elif not offset and (c := cls._CACHE.get(x)) is not None:
+            return c
+        else:
+            return super().__new__(cls, x + offset)
+
+    #
+
+    _name_and_offset: ta.Tuple[str, int]
 
     @property
-    def effective_name(self) -> ta.Optional[str]:
+    def name_and_offset(self) -> ta.Tuple[str, int]:
         try:
-            return self._effective_name
+            return self._name_and_offset
         except AttributeError:
             pass
 
-        if (n := self.exact_name) is None:
+        if (n := self._NAMES_BY_INT.get(self)) is not None:
+            t = (n, 0)
+        else:
             for n, i in self._NAME_INT_PAIRS:  # noqa
                 if self >= i:
+                    t = (n, (self - i))
                     break
             else:
-                n = None
+                t = ('NOTSET', int(self))
 
-        self._effective_name = n
+        self._name_and_offset = t
+        return t
+
+    @property
+    def exact_name(self) -> ta.Optional[str]:
+        n, o = self.name_and_offset
+        return n if not o else None
+
+    @property
+    def effective_name(self) -> str:
+        n, _ = self.name_and_offset
         return n
 
     #
 
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({int(self)})'
-
     def __str__(self) -> str:
-        return self.exact_name or f'{self.effective_name or "INVALID"}:{int(self)}'
+        return self.exact_name or f'{self.effective_name}{int(self):+}'
+
+    def __repr__(self) -> str:
+        n, o = self.name_and_offset
+        return f'{self.__class__.__name__}({n!r}{f", {int(o)}" if o else ""})'
 
     #
 
@@ -3144,6 +3175,9 @@ NamedLogLevel.DEBUG = NamedLogLevel(logging.DEBUG)
 NamedLogLevel.NOTSET = NamedLogLevel(logging.NOTSET)
 
 
+NamedLogLevel._CACHE.update({i: NamedLogLevel(i) for i in NamedLogLevel._NAMES_BY_INT})  # noqa
+
+
 ########################################
 # ../../../omlish/logs/std/filters.py
 
@@ -5532,7 +5566,9 @@ class PredicateTimeout(Timeout):
 ##
 
 
-class LoggingCaller(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+@logging_context_info
+@ta.final
+class LoggingCaller(ta.NamedTuple):
     file_path: str
     line_no: int
     name: str
@@ -5585,10 +5621,10 @@ class LoggingCaller(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
                 sinfo = sinfo[:-1]
 
         return cls(
-            f.f_code.co_filename,
-            f.f_lineno or 0,
-            f.f_code.co_name,
-            sinfo,
+            file_path=f.f_code.co_filename,
+            line_no=f.f_lineno or 0,
+            name=f.f_code.co_name,
+            stack_info=sinfo,
         )
 
 
@@ -5599,6 +5635,7 @@ class LoggingCaller(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
 ##
 
 
+@ta.runtime_checkable
 class LoggerLike(ta.Protocol):
     """Satisfied by both our Logger and stdlib logging.Logger."""
 
@@ -5687,7 +5724,9 @@ class JsonLoggingFormatter(logging.Formatter):
 ##
 
 
-class LoggingTimeFields(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+@logging_context_info
+@ta.final
+class LoggingTimeFields(ta.NamedTuple):
     """Maps directly to stdlib `logging.LogRecord` fields, and must be kept in sync with it."""
 
     created: float
@@ -5735,9 +5774,9 @@ class LoggingTimeFields(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc
         relative_created = (time_ns - start_time_ns) / 1e6
 
         return cls(
-            created,
-            msecs,
-            relative_created,
+            created=created,
+            msecs=msecs,
+            relative_created=relative_created,
         )
 
 
@@ -7577,7 +7616,7 @@ InterpProviders = ta.NewType('InterpProviders', ta.Sequence[InterpProvider])
 
 class AnyLogger(Abstract, ta.Generic[T]):
     def is_enabled_for(self, level: LogLevel) -> bool:
-        return self.get_effective_level() >= level
+        return level >= self.get_effective_level()
 
     @abc.abstractmethod
     def get_effective_level(self) -> LogLevel:
@@ -7774,7 +7813,7 @@ class AsyncLogger(AnyLogger[ta.Awaitable[None]], Abstract):
 class AnyNopLogger(AnyLogger[T], Abstract):
     @ta.final
     def get_effective_level(self) -> LogLevel:
-        return 999
+        return -999
 
 
 @ta.final
@@ -8384,7 +8423,7 @@ class InterpResolver:
 
 
 ########################################
-# ../../../omlish/logs/std/adapters.py
+# ../../../omlish/logs/std/loggers.py
 
 
 ##
@@ -8400,6 +8439,9 @@ class StdLogger(Logger):
     def std(self) -> logging.Logger:
         return self._std
 
+    def is_enabled_for(self, level: LogLevel) -> bool:
+        return self._std.isEnabledFor(level)
+
     def get_effective_level(self) -> LogLevel:
         return self._std.getEffectiveLevel()
 

omdev/tools/git/cli.py

@@ -21,7 +21,6 @@ TODO:
   fatal: Need to specify how to reconcile divergent branches.
 """
 import dataclasses as dc
-import logging
 import os
 import shutil
 import tempfile
@@ -58,7 +57,7 @@ else:
     msh = lang.proxy_import('omlish.marshal')
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

{omdev-0.0.0.dev428.dist-info → omdev-0.0.0.dev430.dist-info}/METADATA

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

{omdev-0.0.0.dev428.dist-info → omdev-0.0.0.dev430.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.omlish-manifests.json,sha256=diaasURIGOs_kTukNgRFlaZ3Vq7kRGYLvOKAP5hqeMU,11909
+omdev/.omlish-manifests.json,sha256=KfVVQzsOja2Zhq2VWbwmRSR_KN9aYcFWehbVCuM2AjA,11909
 omdev/__about__.py,sha256=fQNmzSa1MntcPSrzg_Vpo6JRU2RbXik2NqRz0oQCApE,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=gu49t10_syXh_TUJs4POsxeFs8we8Y3XTOOPgIXmGvg,4608
@@ -9,7 +9,7 @@ omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=nGxQ4PLd2u7zf6dH4TDWZg6yrVe3FxIVn9sGT5w8O-o,174
 omdev/amalg/sources.py,sha256=wxPxPFnxRhPSRhQoWn9bpTYopXW-tanJQLvVQkf2K_A,1379
 omdev/amalg/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/amalg/cli/main.py,sha256=U1PQ8JfdzQ1l4m-TS9YECTcTLltuQSxB6oIomVemg6w,4323
+omdev/amalg/cli/main.py,sha256=uoPQo_7pevBd5dX_3-wHrXWN-Mr6eUeHy70OCNE0Bss,4314
 omdev/amalg/gen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/gen/gen.py,sha256=95iQT0At_NsMf4IEg702ZOmmyEdhCZJGcSCFypm1BTk,6194
 omdev/amalg/gen/imports.py,sha256=Bv3xNgej1Nsuv5R_y-9wd9b8cPtWljZsxjMh9bolJWc,2074
@@ -30,7 +30,7 @@ omdev/cache/compute/storage.py,sha256=3oHJGhIO3gilEyOIDR2UiB8yPKcw9xwWWvoQ0_ZjxZ
 omdev/cache/compute/types.py,sha256=pF5htSH7oXyky2mxCqGhb_xhOc_GKnjnBAu6lzxaeM8,2645
 omdev/cache/data/__init__.py,sha256=SQXtugLceRif463rcoklpQ33pxYLgEIm0xiI6NvOI6M,301
 omdev/cache/data/actions.py,sha256=Mv7eXeZuohCjQLpmLyvqvGjjBacXIvTYzIRMVpEh-zM,1037
-omdev/cache/data/cache.py,sha256=thX1Xk_s7WeAfSer2T40ZUJHSz91pPKy1alcN-7jt-w,7633
+omdev/cache/data/cache.py,sha256=h5xQUxiye2exsMUWh1pDeMz_t3LEC75kvloIDg57xMI,7660
 omdev/cache/data/consts.py,sha256=d6W_aeMqgah6PmPYi9RA8Be54oQ4BcNCy8kDQ7FlB_Q,26
 omdev/cache/data/defaults.py,sha256=NL_mT7kaSLm2Mk9VO5wdSu-DIcHTR1KgcihJqdSd4TY,312
 omdev/cache/data/manifests.py,sha256=NweXxbkuLMBG1DiUFliOSYeXBrLPMIY4GA_gOZzHwho,949
@@ -52,26 +52,26 @@ omdev/cc/srclangs.py,sha256=3u_APHgknuc-BPRQSDISwSzouluKsnLlBxodp-XCl_E,728
 omdev/cexts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cexts/_boilerplate.cc,sha256=sbpXEgdFrkdzZXgaNWFFNN27fL9TZu6VrwvMY4-nnFM,1726
 omdev/cexts/build.py,sha256=JxEuqSpspnY6kWn8eB89FjcSjF4bpNgVYNeIvwmWehY,2659
-omdev/cexts/cmake.py,sha256=yqSRV3K0Shsk3z_GMKDbwJiX_C4L4AZ7NJXupGpe1vE,10059
+omdev/cexts/cmake.py,sha256=7CSL9AsWaJnad94dw9QxbZLirtxdlg7Au7EQ1g7H74g,10050
 omdev/cexts/importhook.py,sha256=GZ04bE6tMQ8uQUUzGr22Rt9cwyI6kkoK4t7xpLP2Lrs,3562
 omdev/cexts/magic.py,sha256=DglhjCXEiL28pFTN4lrmUW6ZLn6HaumR13ptyaFOez4,131
-omdev/cexts/scan.py,sha256=lhK5-8bylu6qZcAfoS-rjdx8c9TLVzqnrPm44cIowKQ,1682
+omdev/cexts/scan.py,sha256=94UqVgxBrAHn_VyW_ZA3-hB_R6pWIJRWqvtSBEg_O4U,1673
 omdev/cexts/_distutils/LICENSE,sha256=22p14FIRp3F4Cb7Mj_GK33PKr25issFGHC2JN6dg9vc,1023
 omdev/cexts/_distutils/__init__.py,sha256=c1zImtnPh3uY8BUTV4RLKtGKqTPx3c_pBbhA6tPtNsE,297
-omdev/cexts/_distutils/build_ext.py,sha256=pwdqqFKyls4uUAGYMyK4zDPCwyWkOTV5KKi_9sRyylA,13840
-omdev/cexts/_distutils/dir_util.py,sha256=xxfAIPHbjlh-aW9OX6UGDrXiXfB5biG4xEC5RA6oszM,2882
-omdev/cexts/_distutils/errors.py,sha256=HWmsruDLOctJwjZ3yjIkef6O-NI2m0A74tLYZKbS-TY,2035
-omdev/cexts/_distutils/extension.py,sha256=CAxie5k3eCD-k-OaBPYYsyOFbgcWgx0oipA2D6_hrIs,5631
-omdev/cexts/_distutils/file_util.py,sha256=glpfHGEDZKMS_VAIgr3YlExtQfNP4agxOrn3WenjE7U,7804
-omdev/cexts/_distutils/modified.py,sha256=OI4guORuIv16fyFTS-B_eaPSELttGPVeZCYgjR357Ec,1723
-omdev/cexts/_distutils/spawn.py,sha256=ROud2VB_tyktPGq6ldsOyFTGIsvSvYAQf_ioWQh0XH0,3435
-omdev/cexts/_distutils/sysconfig.py,sha256=lVMnczs-4vSqzWeHzDo6ImRW-uAAR0ZIGVJwnyhfjp8,12654
-omdev/cexts/_distutils/util.py,sha256=k4t8w-8VWLVzFh5LvfSpygkssSfrU7LaMT6xIMQQkQw,6413
-omdev/cexts/_distutils/version.py,sha256=0Z8veDAUFclFHGoX9USchD2TdV1ECe8yD83vPLOxaSI,12558
+omdev/cexts/_distutils/build_ext.py,sha256=urqWd8fIHY4v8Q9FVK8Plgkp4xwpilKvna9-Dphp0io,13872
+omdev/cexts/_distutils/dir_util.py,sha256=llDo9EpCec91hY4XnqesSigenXS8F4RTdCoJ7hYFguc,2915
+omdev/cexts/_distutils/errors.py,sha256=ITuhD_Vk-KD2z6JEBxIFUoGkCkn1MotgbNh5OP9tEd4,2040
+omdev/cexts/_distutils/extension.py,sha256=MG-W77JvN5rkzuqHcq-Y5zJEYYCPfwlSzqK0XBNsMKw,5636
+omdev/cexts/_distutils/file_util.py,sha256=O1dCq13Y7PCEBWYlzgSEfwG70TkS0eLxaPcV8sr11gA,7837
+omdev/cexts/_distutils/modified.py,sha256=0iTW3mFNJMohDtKOaqhM8zVBQRAX142-xm2eNE4HCJM,1728
+omdev/cexts/_distutils/spawn.py,sha256=cBVCmBl-zAvQG2p2UTmF10Odrw0TFYDJ19XdiVNNXPQ,3468
+omdev/cexts/_distutils/sysconfig.py,sha256=YVQl9ChV0JiYZLFcPgcHMCCWX2QK0ECTbGajLodiKFs,12659
+omdev/cexts/_distutils/util.py,sha256=l0TpopYsS_LadTd-W9VFyoD0RPhXqGX-33AdVPHN96g,6446
+omdev/cexts/_distutils/version.py,sha256=003kpYCV9IwuOFxtfoRgGKpuz8MkgJucYHBcEVmFcoc,12563
 omdev/cexts/_distutils/compilers/__init__.py,sha256=amL_zrFlba0lHIvpqDne9uhqhLemA7hBZFX-MHL7R3c,68
-omdev/cexts/_distutils/compilers/ccompiler.py,sha256=cTs88qrvj0hBVXHfemSDE_du_nEA4_qo3Qst5TpQkVI,43606
-omdev/cexts/_distutils/compilers/options.py,sha256=H7r5IcLvga5Fs3jjXWIT-6ap3JBduXRKgtpDmSGCZxs,3818
-omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=KO33tQYjgeRqvl0KOAD87tuChECPYYvJlpij440IE_4,15422
+omdev/cexts/_distutils/compilers/ccompiler.py,sha256=eDJPALnD__VJYeJaJhnghn7q3XMSSa7GL0P44aer3_I,43638
+omdev/cexts/_distutils/compilers/options.py,sha256=ghKhvi2YaC50lwoWK1ewV-xRwbz0EXt6PsbgSdFIfzg,3823
+omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=fgmKXR7_BkZu1E3oVu6IpwbtIKtTwpvhnFEpSVtMOuM,15455
 omdev/ci/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/ci/__main__.py,sha256=Jsrv3P7LX2Cg08W7ByZfZ1JQT4lgLDPW1qNAmShFuMk,75
 omdev/ci/cache.py,sha256=aKsNvl7fTJfjpFhUrWgKCNEwgoSfTZpEcn0NUY9BOCM,8456
@@ -131,7 +131,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=5jdj8omkvxb61AN10is4IqCHLuafkJes3jpPhoF1VRA,2994
+omdev/dataclasses/codegen.py,sha256=kPCKttb0gQgV2ChkARFSUPA96DbrvFZV-GyOaO_yQto,3021
 omdev/dataserver/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/dataserver/handlers.py,sha256=q-kw-yiiRxJFmlPRdtqllsg7sv5Jz_ySsNl2xCoM7i4,5490
 omdev/dataserver/http.py,sha256=SMS6w-GVevG58FypqmPytcEqW8aUWpd2_F6JlBDIuBc,1730
@@ -219,8 +219,8 @@ omdev/precheck/base.py,sha256=fKdrfakq2u1UU1_JZFnl-non9bIAZMsSkVY1SMYn8xQ,662
 omdev/precheck/caches.py,sha256=OZKP20DIj6OpUzdNwrjCufv1GzndEbsc7tLD-qHNv9g,1736
 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/lite.py,sha256=sseaKHMZgMhIEuifZvPJm0-wuRqRUrnyySJfHBMItOM,4737
+omdev/precheck/main.py,sha256=nbTXR7d2vVMOyrXBVKFyQfmTm1H5tpk7Pe2Zphk-LqI,4365
 omdev/precheck/manifests.py,sha256=dxl7GSJHKjQrR6mbwvj6j92XDGHOpxxEEQ6smJkBEe4,810
 omdev/precheck/scripts.py,sha256=6nb_lDgyX7u9kdF_BU6ubY01q_jGk96VH9q9gpOieng,1753
 omdev/precheck/unicode.py,sha256=VUNDCrlfUas_U8ugV_q0eFUXuBgKjS8YdCFm0FXREXo,2583
@@ -259,7 +259,7 @@ omdev/py/scripts/execstat.py,sha256=-c5ioQRruBrD5M0QDzSMaaq4Oe3X3-1O_d63bXjE5EI,
 omdev/py/scripts/importtrace.py,sha256=OOf9GvB6PWP2uVzogSYsM5JGUAoSfMx1IKfYUXB8ABc,14245
 omdev/py/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/py/tools/importscan.py,sha256=4dCH0coX0OqNwesteKaTE8GxuSfLhgXYQlzNUXLiSNY,4640
-omdev/py/tools/mkrelimp.py,sha256=F7g6Cesdb4MPz1EKiN1iQpqOUUwTNQAVEQZhK0l-yhc,4049
+omdev/py/tools/mkrelimp.py,sha256=40gE1p_w-f_oWptUiS8TqODhso6ow46UCEptw4VbH0c,4040
 omdev/pyproject/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/pyproject/__main__.py,sha256=gn3Rl1aYPYdiTtEqa9ifi0t-e4ZwPY0vhJ4UXvYdJDY,165
 omdev/pyproject/cexts.py,sha256=GLD4fe61M_fHhdMcKlcQNUoCb7MeVXY6Fw-grKH4hTU,4264
@@ -273,9 +273,9 @@ 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=x9kaHiFye-5NXmQ-tAl2w8Wf5O-xpTQJ-fWpuiWAGiw,407069
-omdev/scripts/interp.py,sha256=b2l2cINVlk1TUfhzCJ2l6SWMkATVmc7KeXEvhaop0Fc,165392
-omdev/scripts/pyproject.py,sha256=AfZ3YHpPjMHlxKd1u37T8NuxRJEhPYDRzEAI-vGMvrY,314149
+omdev/scripts/ci.py,sha256=2e3NgokoLd1SjHGLUKLcV_Bah3eBNBw_67hNT8XKe54,408056
+omdev/scripts/interp.py,sha256=yJWWo_3qOmI2Evfel02j79KzfZqYN2eBCLnphZZFecs,166357
+omdev/scripts/pyproject.py,sha256=LGUUUu4R2TRqUdEs5akqJkxFM7A-FI36I_SHSG3qJ4Y,315115
 omdev/scripts/slowcat.py,sha256=PwdT-pg62imEEb6kcOozl9_YUi-4KopvjvzWT1OmGb0,2717
 omdev/scripts/tmpexec.py,sha256=t0nErDRALjTk7H0X8ADjZUIDFjlPNzOOokmjCjBHdzs,1431
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -298,7 +298,7 @@ omdev/tools/shell.py,sha256=5hF_8DCtB3XrzJSfmQDsr7X3Fi9KRV4M70q9qp0KREA,2341
 omdev/tools/sqlrepl.py,sha256=TcLJlElzfXqYUkfIOwhJHtXiQjXOg4xBTwSoSRDpNkg,5758
 omdev/tools/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/git/__main__.py,sha256=gI87SBUgTkKUcUM-RtZWnei-UUDDqzbr5aPztb-gvbE,168
-omdev/tools/git/cli.py,sha256=I4AiCTz4OCzK6s8J2TJF1eYw9FH2JIK_CsdjQH_9UTE,16757
+omdev/tools/git/cli.py,sha256=6E-k-eiDn1gKyaRH_j5Ci_dgTmAl2pAbLtGmG3xgPAA,16748
 omdev/tools/git/cloning.py,sha256=CNGBBMoWaTBJW4SZTf1VvhDFSm0yg7qDfNwZun_PFbU,891
 omdev/tools/git/consts.py,sha256=JuXivUNDkNhM4pe97icjRVAKM8cNRbrODquHINNKqOE,40
 omdev/tools/git/messages.py,sha256=R39pXfXt8394eC99rpTdRlbcMrAdLxwsgTR4pwRRa-o,2321
@@ -319,9 +319,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.dev428.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev428.dist-info/METADATA,sha256=roKxde9gZ6yvwmj3QR5bnfv9CDR3G-4gZGxm35lBPuY,5100
-omdev-0.0.0.dev428.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev428.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev428.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev428.dist-info/RECORD,,
+omdev-0.0.0.dev430.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev430.dist-info/METADATA,sha256=VDCfaZdGEwKcsAewHXSxMQRoZsHLoFpnGZ02o9WpORs,5100
+omdev-0.0.0.dev430.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev430.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev430.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev430.dist-info/RECORD,,