omdev 0.0.0.dev424__py3-none-any.whl → 0.0.0.dev426__py3-none-any.whl

omdev/scripts/interp.py

@@ -644,7 +644,7 @@ class _AbstractCachedNullary:
     def __call__(self, *args, **kwargs):  # noqa
         raise TypeError
 
-    def __get__(self, instance, owner):  # noqa
+    def __get__(self, instance, owner=None):  # noqa
         bound = instance.__dict__[self._fn.__name__] = self.__class__(self._fn.__get__(instance, owner))
         return bound
 
@@ -1370,13 +1370,6 @@ def split_keep_delimiter(s, d):
 ##
 
 
-def attr_repr(obj: ta.Any, *attrs: str) -> str:
-    return f'{type(obj).__name__}({", ".join(f"{attr}={getattr(obj, attr)!r}" for attr in attrs)})'
-
-
-##
-
-
 FORMAT_NUM_BYTES_SUFFIXES: ta.Sequence[str] = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB']
 
 
@@ -1393,13 +1386,13 @@ def format_num_bytes(num_bytes: int) -> str:
 
 
 ########################################
-# ../../../omlish/logs/filters.py
+# ../../../omlish/logs/std/filters.py
 
 
 ##
 
 
-class TidLogFilter(logging.Filter):
+class TidLoggingFilter(logging.Filter):
     def filter(self, record):
         # FIXME: handle better - missing from wasm and cosmos
         if hasattr(threading, 'get_native_id'):
@@ -1410,13 +1403,13 @@ class TidLogFilter(logging.Filter):
 
 
 ########################################
-# ../../../omlish/logs/proxy.py
+# ../../../omlish/logs/std/proxy.py
 
 
 ##
 
 
-class ProxyLogFilterer(logging.Filterer):
+class ProxyLoggingFilterer(logging.Filterer):
     def __init__(self, underlying: logging.Filterer) -> None:  # noqa
         self._underlying = underlying
 
@@ -1442,9 +1435,9 @@ class ProxyLogFilterer(logging.Filterer):
         return self._underlying.filter(record)
 
 
-class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
+class ProxyLoggingHandler(ProxyLoggingFilterer, logging.Handler):
     def __init__(self, underlying: logging.Handler) -> None:  # noqa
-        ProxyLogFilterer.__init__(self, underlying)
+        ProxyLoggingFilterer.__init__(self, underlying)
 
     _underlying: logging.Handler
 
@@ -2472,6 +2465,7 @@ class _Maybe(Maybe[T], Abstract):
             return op and not sp
 
 
+@ta.final
 class _JustMaybe(_Maybe[T]):
     __slots__ = ('_v', '_hash')
 
@@ -2509,6 +2503,7 @@ class _JustMaybe(_Maybe[T]):
         )
 
 
+@ta.final
 class _EmptyMaybe(_Maybe[T]):
     __slots__ = ()
 
@@ -2754,7 +2749,7 @@ class PredicateTimeout(Timeout):
 
 
 ########################################
-# ../../../omlish/logs/json.py
+# ../../../omlish/logs/std/json.py
 """
 TODO:
  - translate json keys
@@ -2764,7 +2759,7 @@ TODO:
 ##
 
 
-class JsonLogFormatter(logging.Formatter):
+class JsonLoggingFormatter(logging.Formatter):
     KEYS: ta.Mapping[str, bool] = {
         'name': False,
         'msg': False,
@@ -4019,6 +4014,7 @@ inj = InjectionApi()
 # ../../../omlish/logs/standard.py
 """
 TODO:
+ - !! move to std !!
  - structured
  - prefixed
  - debug
@@ -4040,7 +4036,7 @@ STANDARD_LOG_FORMAT_PARTS = [
 ]
 
 
-class StandardLogFormatter(logging.Formatter):
+class StandardLoggingFormatter(logging.Formatter):
     @staticmethod
     def build_log_format(parts: ta.Iterable[ta.Tuple[str, str]]) -> str:
         return ' '.join(v for k, v in parts)
@@ -4059,7 +4055,7 @@ class StandardLogFormatter(logging.Formatter):
 ##
 
 
-class StandardConfiguredLogHandler(ProxyLogHandler):
+class StandardConfiguredLoggingHandler(ProxyLoggingHandler):
     def __init_subclass__(cls, **kwargs):
         raise TypeError('This class serves only as a marker and should not be subclassed.')
 
@@ -4092,7 +4088,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
-) -> ta.Optional[StandardConfiguredLogHandler]:
+) -> ta.Optional[StandardConfiguredLoggingHandler]:
     with _locking_logging_module_lock():
         if target is None:
             target = logging.root
@@ -4100,7 +4096,7 @@ def configure_standard_logging(
         #
 
         if not force:
-            if any(isinstance(h, StandardConfiguredLogHandler) for h in list(target.handlers)):
+            if any(isinstance(h, StandardConfiguredLoggingHandler) for h in list(target.handlers)):
                 return None
 
         #
@@ -4114,14 +4110,14 @@ def configure_standard_logging(
 
         formatter: logging.Formatter
         if json:
-            formatter = JsonLogFormatter()
+            formatter = JsonLoggingFormatter()
         else:
-            formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+            formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
         handler.setFormatter(formatter)
 
         #
 
-        handler.addFilter(TidLogFilter())
+        handler.addFilter(TidLoggingFilter())
 
         #
 
@@ -4134,7 +4130,7 @@ def configure_standard_logging(
 
         #
 
-        return StandardConfiguredLogHandler(handler)
+        return StandardConfiguredLoggingHandler(handler)
 
 
 ########################################

omdev/scripts/pyproject.py

@@ -2068,7 +2068,7 @@ class _AbstractCachedNullary:
     def __call__(self, *args, **kwargs):  # noqa
         raise TypeError
 
-    def __get__(self, instance, owner):  # noqa
+    def __get__(self, instance, owner=None):  # noqa
         bound = instance.__dict__[self._fn.__name__] = self.__class__(self._fn.__get__(instance, owner))
         return bound
 
@@ -2629,13 +2629,6 @@ json_dump_compact: ta.Callable[..., None] = functools.partial(json.dump, **JSON_
 json_dumps_compact: ta.Callable[..., str] = functools.partial(json.dumps, **JSON_COMPACT_KWARGS)
 
 
-########################################
-# ../../../omlish/lite/logs.py
-
-
-log = logging.getLogger(__name__)
-
-
 ########################################
 # ../../../omlish/lite/objects.py
 
@@ -2881,13 +2874,6 @@ def split_keep_delimiter(s, d):
 ##
 
 
-def attr_repr(obj: ta.Any, *attrs: str) -> str:
-    return f'{type(obj).__name__}({", ".join(f"{attr}={getattr(obj, attr)!r}" for attr in attrs)})'
-
-
-##
-
-
 FORMAT_NUM_BYTES_SUFFIXES: ta.Sequence[str] = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB']
 
 
@@ -2962,13 +2948,24 @@ def typing_annotations_attr() -> str:
 
 
 ########################################
-# ../../../omlish/logs/filters.py
+# ../../../omlish/logs/modules.py
+
+
+##
+
+
+def get_module_logger(mod_globals: ta.Mapping[str, ta.Any]) -> logging.Logger:
+    return logging.getLogger(mod_globals.get('__name__'))
+
+
+########################################
+# ../../../omlish/logs/std/filters.py
 
 
 ##
 
 
-class TidLogFilter(logging.Filter):
+class TidLoggingFilter(logging.Filter):
     def filter(self, record):
         # FIXME: handle better - missing from wasm and cosmos
         if hasattr(threading, 'get_native_id'):
@@ -2979,13 +2976,13 @@ class TidLogFilter(logging.Filter):
 
 
 ########################################
-# ../../../omlish/logs/proxy.py
+# ../../../omlish/logs/std/proxy.py
 
 
 ##
 
 
-class ProxyLogFilterer(logging.Filterer):
+class ProxyLoggingFilterer(logging.Filterer):
     def __init__(self, underlying: logging.Filterer) -> None:  # noqa
         self._underlying = underlying
 
@@ -3011,9 +3008,9 @@ class ProxyLogFilterer(logging.Filterer):
         return self._underlying.filter(record)
 
 
-class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
+class ProxyLoggingHandler(ProxyLoggingFilterer, logging.Handler):
     def __init__(self, underlying: logging.Handler) -> None:  # noqa
-        ProxyLogFilterer.__init__(self, underlying)
+        ProxyLoggingFilterer.__init__(self, underlying)
 
     _underlying: logging.Handler
 
@@ -3843,6 +3840,9 @@ TODO:
 """
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
@@ -5129,6 +5129,7 @@ class _Maybe(Maybe[T], Abstract):
             return op and not sp
 
 
+@ta.final
 class _JustMaybe(_Maybe[T]):
     __slots__ = ('_v', '_hash')
 
@@ -5166,6 +5167,7 @@ class _JustMaybe(_Maybe[T]):
         )
 
 
+@ta.final
 class _EmptyMaybe(_Maybe[T]):
     __slots__ = ()
 
@@ -5411,7 +5413,7 @@ class PredicateTimeout(Timeout):
 
 
 ########################################
-# ../../../omlish/logs/json.py
+# ../../../omlish/logs/std/json.py
 """
 TODO:
  - translate json keys
@@ -5421,7 +5423,7 @@ TODO:
 ##
 
 
-class JsonLogFormatter(logging.Formatter):
+class JsonLoggingFormatter(logging.Formatter):
     KEYS: ta.Mapping[str, bool] = {
         'name': False,
         'msg': False,
@@ -6676,6 +6678,7 @@ inj = InjectionApi()
 # ../../../omlish/logs/standard.py
 """
 TODO:
+ - !! move to std !!
  - structured
  - prefixed
  - debug
@@ -6697,7 +6700,7 @@ STANDARD_LOG_FORMAT_PARTS = [
 ]
 
 
-class StandardLogFormatter(logging.Formatter):
+class StandardLoggingFormatter(logging.Formatter):
     @staticmethod
     def build_log_format(parts: ta.Iterable[ta.Tuple[str, str]]) -> str:
         return ' '.join(v for k, v in parts)
@@ -6716,7 +6719,7 @@ class StandardLogFormatter(logging.Formatter):
 ##
 
 
-class StandardConfiguredLogHandler(ProxyLogHandler):
+class StandardConfiguredLoggingHandler(ProxyLoggingHandler):
     def __init_subclass__(cls, **kwargs):
         raise TypeError('This class serves only as a marker and should not be subclassed.')
 
@@ -6749,7 +6752,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
-) -> ta.Optional[StandardConfiguredLogHandler]:
+) -> ta.Optional[StandardConfiguredLoggingHandler]:
     with _locking_logging_module_lock():
         if target is None:
             target = logging.root
@@ -6757,7 +6760,7 @@ def configure_standard_logging(
         #
 
         if not force:
-            if any(isinstance(h, StandardConfiguredLogHandler) for h in list(target.handlers)):
+            if any(isinstance(h, StandardConfiguredLoggingHandler) for h in list(target.handlers)):
                 return None
 
         #
@@ -6771,14 +6774,14 @@ def configure_standard_logging(
 
         formatter: logging.Formatter
         if json:
-            formatter = JsonLogFormatter()
+            formatter = JsonLoggingFormatter()
         else:
-            formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+            formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
         handler.setFormatter(formatter)
 
         #
 
-        handler.addFilter(TidLogFilter())
+        handler.addFilter(TidLoggingFilter())
 
         #
 
@@ -6791,7 +6794,7 @@ def configure_standard_logging(
 
         #
 
-        return StandardConfiguredLogHandler(handler)
+        return StandardConfiguredLoggingHandler(handler)
 
 
 ########################################
@@ -8064,6 +8067,9 @@ TODO:
 """
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
@@ -8653,6 +8659,9 @@ vcs+protocol://repo_url/#egg=pkg&subdirectory=pkg_dir
 """  # noqa
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
@@ -8941,7 +8950,7 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         #         '*.c',
         #         '*.cc',
         #         '*.h',
-        #         '.manifests.json',
+        #         '.omlish-manifests.json',
         #         'LICENSE',
         #     ],
         # }
@@ -9637,6 +9646,9 @@ class PyprojectConfigPreparer:
 # ../venvs.py
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

omdev/tools/json/processing.py

@@ -57,7 +57,7 @@ class Processor:
             factory=self._marshaler_factory(),
         ).marshal(v)
 
-    def process(self, v: ta.Any) -> ta.Iterable[ta.Any]:
+    def process(self, v: ta.Any) -> ta.Iterator[ta.Any]:
         if self._jmespath_expr is not None:
             v = self._jmespath_expr.search(v)
 

{omdev-0.0.0.dev424.dist-info → omdev-0.0.0.dev426.dist-info}/METADATA

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

{omdev-0.0.0.dev424.dist-info → omdev-0.0.0.dev426.dist-info}/RECORD

@@ -1,8 +1,8 @@
-omdev/.manifests.json,sha256=ZAZsJbIOCRvMs_KnlVkZov1U0KUzvvprzUP3UtLSpX8,12182
+omdev/.omlish-manifests.json,sha256=diaasURIGOs_kTukNgRFlaZ3Vq7kRGYLvOKAP5hqeMU,11909
 omdev/__about__.py,sha256=fQNmzSa1MntcPSrzg_Vpo6JRU2RbXik2NqRz0oQCApE,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=gu49t10_syXh_TUJs4POsxeFs8we8Y3XTOOPgIXmGvg,4608
-omdev/imgur.py,sha256=oG4jZH2EAk1my0JzoPNes-4LCtF2_aU08vmKbGzmuxo,3129
+omdev/imgur.py,sha256=oqei705LhSnLWQTOMHMHwRecRXcpSEP90Sg4SVINPQ0,3133
 omdev/pip.py,sha256=PqzAWDO_CbiZvXzJAZcCkFqWynUDls1jIgBWlrswQyA,2012
 omdev/tagstrings.py,sha256=cBmAc9-TtOBupvGQ9G4T1jjjtzijx4ihQCBu6FezzV0,5490
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -74,9 +74,9 @@ omdev/cexts/_distutils/compilers/options.py,sha256=H7r5IcLvga5Fs3jjXWIT-6ap3JBdu
 omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=KO33tQYjgeRqvl0KOAD87tuChECPYYvJlpij440IE_4,15422
 omdev/ci/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/ci/__main__.py,sha256=Jsrv3P7LX2Cg08W7ByZfZ1JQT4lgLDPW1qNAmShFuMk,75
-omdev/ci/cache.py,sha256=LlxBTNr67IPYVrxFErHyvKOUPyUG3tLuVUbjMQL7UQg,8394
+omdev/ci/cache.py,sha256=aKsNvl7fTJfjpFhUrWgKCNEwgoSfTZpEcn0NUY9BOCM,8456
 omdev/ci/ci.py,sha256=ZCBQuX5fiyzgBLFndxh1To2J-KrjoPlw4EvEruDIdjg,7923
-omdev/ci/cli.py,sha256=E7GiQQBf8E02TwGnLS0ZLiv0J5TasjgOjjgSsJEW60E,7194
+omdev/ci/cli.py,sha256=jmvG-xTm97pRtoqtaF6qru4Cros-3e4r6q3h_V0XNoY,7256
 omdev/ci/compose.py,sha256=SXjWuHuLN9NQttvnJ440A88VI7JPU0sSaQhfWe_-IKs,4518
 omdev/ci/consts.py,sha256=HkSYz-_hHilcHPBvRs-SwcUxW7vMNlHXZ8OyIKnVQbQ,21
 omdev/ci/inject.py,sha256=Yk7bT7sRC76PUN9qQ07MiveAuQmi1LZBKxah7VKOB5Q,1930
@@ -90,11 +90,11 @@ omdev/ci/docker/cmds.py,sha256=1aSLQqbMJpdAMskxfeGI-he5Amb910RWvo2DE6ZgID8,3067
 omdev/ci/docker/dataserver.py,sha256=v5q5z0HaGMMSbDhh7xsGePwBfmkn-dL8b2JVotbMVRs,5880
 omdev/ci/docker/imagepulling.py,sha256=Ut-qE7nmuCxNw5l_LpeJdCcu9f7MCX_KuEFyFkBYMd0,1875
 omdev/ci/docker/inject.py,sha256=vlWoIJHx2hzCai4wWspIcWnR3WhZ2bsOjq7fqq0qozE,2006
-omdev/ci/docker/packing.py,sha256=IayecomyP6AdaiKP1-Ki1wcb2ayfZz2mDqHWbPD8y50,2022
+omdev/ci/docker/packing.py,sha256=ePvHU6rtMh7fq8Ijethuw8eCfjOTi-xhzBQbLSk7M0A,2021
 omdev/ci/docker/repositories.py,sha256=-uNB93u3pOxsOeib4xovixtbhwGhFWVfxQ00V8Yy89Y,1278
 omdev/ci/docker/utils.py,sha256=7Tobiq2hMxicGpQfTkDoU7oTa8Tyw47LpDh8C554LLs,1135
 omdev/ci/docker/cacheserved/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/ci/docker/cacheserved/cache.py,sha256=V9R1_HBNJzMGFqiSnTAP1M4VAv9pJBsXYvR7I52wR50,7025
+omdev/ci/docker/cacheserved/cache.py,sha256=T6V2e7aSZ0lTnldLln3YDPPcQE9JRQhSmsGJf9GB0bk,7087
 omdev/ci/docker/cacheserved/manifests.py,sha256=-T-KLDTLJ-HvcDn6E2tHc2B6KZQjW5Ev8lvNCcx9aHw,3614
 omdev/ci/github/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/ci/github/bootstrap.py,sha256=yZnZVkz9bKCo5G7n-jRQFP8XR76yyuF1BVaTsmUpHdI,441
@@ -103,14 +103,14 @@ omdev/ci/github/cli.py,sha256=gvDz4Rd9Arw0VIptfbEVJG97kTuypYNdWGvODrjhA84,1132
 omdev/ci/github/env.py,sha256=HQOUPvKHNmHUkX7WjoStiLPLq_yGwR09jbZQJhmkKPs,405
 omdev/ci/github/inject.py,sha256=fxyjSiMhSCPKpYX-W6DM4b7QxKEBgkQ-AmZG6f9xgac,564
 omdev/ci/github/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/ci/github/api/clients.py,sha256=bpOyYm9P_-ErfrAwCg6y8lAcXzZVEimCw6RHv5qVzNg,13550
+omdev/ci/github/api/clients.py,sha256=BKZL7nTkH917U8dknSB3ZH7D4kVjk_Ow805wTor_oPs,13612
 omdev/ci/github/api/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/ci/github/api/v1/api.py,sha256=KPmPAiCKEGwz4busb9Ig1n2f_CIqqWb7E-9CZANxtSc,3199
-omdev/ci/github/api/v1/client.py,sha256=OM1e642eRz_cEJVb0hKoAs7vE_j_nGy0H4ePtiamYWY,4983
+omdev/ci/github/api/v1/client.py,sha256=sc_xj3H_Nuh4CluZlQNLctdfFMa0EEck681VZBXo7Zg,5045
 omdev/ci/github/api/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/ci/github/api/v2/api.py,sha256=k7yn1ln1oBxFA9XC72bYUc_zZUIx4tSSF4-HZv9iK5g,3969
-omdev/ci/github/api/v2/azure.py,sha256=Xzn48-q7mWs39r6uZLJkjBFUJK8tsWkAQm-ssZSxNCg,5468
-omdev/ci/github/api/v2/client.py,sha256=bJtL_TZ4sB6IDuzfqtEXj-iWivKfyXQZ_MO30lgBlik,6354
+omdev/ci/github/api/v2/azure.py,sha256=Dp0HzCXgaHQzWKPIctXKT_8mvBUnhLUG5nyebVVuFZI,5530
+omdev/ci/github/api/v2/client.py,sha256=XuEAR46tNFZpGRPIPFgdpwTA10mC89wwj-X035Qi508,6416
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=ABWxtuMY29WBOPqC-4LAZK9S9PwGY3zn5aK6HavFPh0,2125
@@ -164,7 +164,7 @@ omdev/interp/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 omdev/interp/providers/base.py,sha256=zMtzMJIDvaI0q1gtsZTCvFiTc7qdhGbUcXRs6LCBmgo,1333
 omdev/interp/providers/inject.py,sha256=NSDFBQVD3ZR9Mf162XB9_VvTUAXGCRhPcrjVlYcFDJk,857
 omdev/interp/providers/running.py,sha256=M3Ni41f-iHRVEySyxogensOfh1RkONQ91kIMrfurY_M,786
-omdev/interp/providers/standalone.py,sha256=9YVU9uGGxDFidnGkQ1kSIvjKrFQyhWDu45gBboFVicI,7736
+omdev/interp/providers/standalone.py,sha256=-aAXbuixpUGmjX3e-Cw8vZErgKcSPkjwdk8DOr6RQ-4,7798
 omdev/interp/providers/system.py,sha256=Lld7a-SZR9tELHxczm72gOYhjETM5nsz8r4l32y03vw,3991
 omdev/interp/pyenv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/interp/pyenv/inject.py,sha256=Qj9nCnZn0eZMOx1jNAYi5f2RlIy8SHmN3maPK1ZDWwo,616
@@ -184,8 +184,8 @@ omdev/magic/prepare.py,sha256=SEOK-bl4zDxq0aphYXsEI-hCjbkV908VNnJt-dk0kL4,594
 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=LqrqmiiJp774xW2nxNqt4qWOzN-UhLSMJf_eUss8D0s,52703
-omdev/manifests/building.py,sha256=vdUJNcuZtJUNDLjnEOIXsptnGh_oxNEclQGMUM6HGKA,13832
+omdev/manifests/_dumping.py,sha256=H0nFCPDg8ooiDFKv435XcW3iz-j9sd2hz-klt9K_DeA,52553
+omdev/manifests/building.py,sha256=M3IHQljk0ca0J32-xNTOcFVvW07s_7fHQ7sGsCJeurU,13908
 omdev/manifests/dumping.py,sha256=WUIZDvOyO25AhnCPn5Nxj2OkMcZa1LRjGuCnpyx8AL8,4506
 omdev/manifests/main.py,sha256=mYb8iM5bdwaO8jSd9_hIBSoYLf2h7e0iLb9aCCbgJ6c,2175
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -209,7 +209,7 @@ omdev/packaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/packaging/marshal.py,sha256=nr7wN-Pi3FGAuh3HaladzDgOgyQl1-vtmxJ_AUOo4d8,2355
 omdev/packaging/names.py,sha256=-orp16m20gSFeKRiGkRNyqFVV4S1y_Djvjdq_5hNwpY,2533
 omdev/packaging/requires.py,sha256=rgEeJh8shqnFCPBtG_3Tu0vASXsvwK26ikJauFcrz0I,15691
-omdev/packaging/revisions.py,sha256=HXatkIyO_P6-hWAdvBEd_bEBj-Kc7KAuz_tqMgp_OYc,4993
+omdev/packaging/revisions.py,sha256=tLNDVtPiygB8mSxwp-kDxeEHhpBzD0jayndjsgUOfkM,5055
 omdev/packaging/specifiers.py,sha256=ooNtc5gJM6d7EnltVFbWs00QfLMNvbgD2M8kguPtpcY,17455
 omdev/packaging/versions.py,sha256=aaB9zKTBCpILIsz6YRJLrmGoGv4gqyhsAFfZ6blye2A,12267
 omdev/packaging/wheelfile.py,sha256=xv-VpLwhgj1UKounbawAOtkJENRvkJJaHSjD4_zZz_o,10016
@@ -237,9 +237,9 @@ omdev/ptk/markdown/markdown.py,sha256=wRxCWSV2u71NP_MTi8A8vVLjZ1TmmaWUZMnvW468Ej
 omdev/ptk/markdown/parser.py,sha256=UppwouvAYh3qzQMKL-BjcyqBIl2KHcocXlWiKFZ7cBA,990
 omdev/ptk/markdown/styles.py,sha256=lc17zooXhff5_2tkqLsCmdq2b_rfSAehmHVR-8Lo2qk,777
 omdev/ptk/markdown/tags.py,sha256=6wF9lbqbpf_WCxEJ_tJP_QtaDCcQKCKYS1CMzHTQg2U,7020
-omdev/ptk/markdown/utils.py,sha256=bwhmV-L4wjLuNLZc-ieWioL1G-EmonmhB031pvpIejw,10513
+omdev/ptk/markdown/utils.py,sha256=lApIIK_n9dgLaC9mHKJf8O8VPrYRHO9qjFON_mqXv1Y,10513
 omdev/py/__init__.py,sha256=u7tLEfRTnPVtWPmKK_ZIvnFkZwTe1q44UQ53cvsix3k,41
-omdev/py/attrdocs.py,sha256=oMDgVqjTgbyACEEZHFvWpg4WA5tG_aOF_HWJm3z5lT0,5169
+omdev/py/attrdocs.py,sha256=Vp9TVMoINTQ_yIM3HB0hcu7owIm2xOztN0WewI4tlrQ,5170
 omdev/py/bracepy.py,sha256=tcZaljRkSsFYMewb1FULHet5HxV6GGqgbmLhlIGqdCw,2742
 omdev/py/classdot.py,sha256=7WVaVio1Q2B92bvVbXVNAubSkce8Zm-UbleBvXhc0IM,1655
 omdev/py/findimports.py,sha256=UPnBzPUwGrmakZ0RhaJdO3TNBQVk7IUREEqmIvsSxb0,4235
@@ -250,7 +250,7 @@ omdev/py/docstrings/attrdoc.py,sha256=xo-AFqEPfz1XppsCMJS80pG1Vdd2TiBsoxZ7YP6ZHC
 omdev/py/docstrings/common.py,sha256=7YUu5-RxhbCEKHMvfUNxXhTd9lcGTC8CGAmWeXZTta4,6378
 omdev/py/docstrings/epydoc.py,sha256=Z6Dg6ImKOY3hP-mZoiwU3nGOReap5vt_T_3LIGnpess,6177
 omdev/py/docstrings/google.py,sha256=zWrhzQ_QGOtH6s9SfmZGCduKv3JJVe6rJlDe-kAdUW8,10552
-omdev/py/docstrings/numpydoc.py,sha256=SLyIoPR5U5HtXJ18yeQf4HlYHtcro3THh9CqeWDDDH4,12266
+omdev/py/docstrings/numpydoc.py,sha256=JxAzfoZDYHf7j6nAOzQHQ89RBm0lpSc5NIgJgJGI-qQ,12266
 omdev/py/docstrings/parser.py,sha256=umJEgQBkSXLwWIKZrBbFCfNrz847vpTNDqTTEwlvHpA,2324
 omdev/py/docstrings/rest.py,sha256=c2xPYg_W01W9eYY_KLKX69E4qu4jpkgUshi5K5EyVv8,5221
 omdev/py/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -259,23 +259,23 @@ 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=kuzfS4GWcGi-ItyhEHSW4hV9ZcfDJL6inDMhDp1V2lE,4049
+omdev/py/tools/mkrelimp.py,sha256=F7g6Cesdb4MPz1EKiN1iQpqOUUwTNQAVEQZhK0l-yhc,4049
 omdev/pyproject/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/pyproject/__main__.py,sha256=gn3Rl1aYPYdiTtEqa9ifi0t-e4ZwPY0vhJ4UXvYdJDY,165
 omdev/pyproject/cexts.py,sha256=GLD4fe61M_fHhdMcKlcQNUoCb7MeVXY6Fw-grKH4hTU,4264
 omdev/pyproject/cli.py,sha256=Umsu2bcJUYeeVXICaZFhKckUBT6VWuYDL4htgCGGQIs,8749
 omdev/pyproject/configs.py,sha256=baNRwHtUW8S8DKCxuKlMbV3Gduujd1PyNURxQ48Nnxk,2813
 omdev/pyproject/inject.py,sha256=Von8_8ofkITLoCEwDHNRAwY0AEdFQg7r2ILS8kcTMuY,325
-omdev/pyproject/pkg.py,sha256=b3lMCIJY9H-c3B2fbrM9h2njZPxJUYw2eabKlarQVXo,14895
-omdev/pyproject/reqs.py,sha256=PmML_hxPyt7HL4z4gd9Sr7OlExnRLGOYsf8QpD141c0,2418
-omdev/pyproject/venvs.py,sha256=_vwhcgMxWUpu1ojNyVw2Zlx1gWwpW_c5EfPMijUqwgU,1918
+omdev/pyproject/pkg.py,sha256=CcWBhsOgim8MYe5ryKDGB8ClRIyiCX6YmYUHRbQ5q_Y,14964
+omdev/pyproject/reqs.py,sha256=LrGr393-yqKbd2K_D-NePrvUIhMDjPG_1cEyQ3qesAM,2480
+omdev/pyproject/venvs.py,sha256=4JIAlNGWNHm4U9OgqG2f1fNwbqEJgQc34bhp9_46MT0,1980
 omdev/pyproject/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=RcaPmV0_M7OYSPrzJWeSOvlfBY1JeI2XgUKaHw_MsNY,371152
-omdev/scripts/interp.py,sha256=31eOLNomhUy9OinV3fLXW2Etc4PYqtW_wVi8vWP5Vec,162513
-omdev/scripts/pyproject.py,sha256=7P6rscfhfhtDikZb0AVyPSgKfuNlutn3_Bj3_mO2EOQ,278706
+omdev/scripts/ci.py,sha256=pqXYqxt3d-N2a3CoOuVIeINjngbuHzLoZ06H7_bZu4Y,374828
+omdev/scripts/interp.py,sha256=3rQWxkZiDgufJ1NBjGAZ4gwaDvOJyFT4aXoueKNuOxQ,162480
+omdev/scripts/pyproject.py,sha256=ICrAsMoBtK_8KtQwnbJbVMoOPL7GkhG1aKqgZWQEG8c,278971
 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
@@ -296,11 +296,6 @@ omdev/tools/qr.py,sha256=1p4tMJmImDa4YTQQNPwQPkM8FnhGRYj6J79BJR-MNHo,1742
 omdev/tools/shadow.py,sha256=4E2ilxa16liIvQxvgU37ITkOMrP6ufShRQfeW7wwtRc,1697
 omdev/tools/shell.py,sha256=5hF_8DCtB3XrzJSfmQDsr7X3Fi9KRV4M70q9qp0KREA,2341
 omdev/tools/sqlrepl.py,sha256=TcLJlElzfXqYUkfIOwhJHtXiQjXOg4xBTwSoSRDpNkg,5758
-omdev/tools/antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/tools/antlr/__main__.py,sha256=7db8YIfCp4GoU-lW7jJJDiLQ6dDrd25M7gUv1AHGj4w,170
-omdev/tools/antlr/cli.py,sha256=QeO5vSUJDL43lAa2EYsLnN-jZBcNOTwB1C9Ua_h7qoA,1228
-omdev/tools/antlr/consts.py,sha256=4xH4jyNE5czXRWCn65jFF0MrAodMPe_kYMWpgMxWmpo,289
-omdev/tools/antlr/gen.py,sha256=spYfyfX_r_1YT4uZ_bEhtGwANenUtZvSOFck5eiNHhQ,5122
 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
@@ -313,7 +308,7 @@ omdev/tools/json/cli.py,sha256=8aXX3ijU3lvPZamkIyUOz-vlBmyIdaX7dCQq5rN7adE,10193
 omdev/tools/json/formats.py,sha256=1qGYb8Kq_yFpLMaecBg-XE3yWSvqRiRbBX8SAElpS9s,2643
 omdev/tools/json/io.py,sha256=sfj2hJS9Hy3aUR8a_lLzOrYcmL9fSKyvOHiofdUASsI,1427
 omdev/tools/json/parsing.py,sha256=xZiOH3jSVErNGKI8AysFf0zzyhivXvRakTQe7rWxhKQ,2052
-omdev/tools/json/processing.py,sha256=G0KVhlrfLQh-xEDNrJrO--LOc6IV8jdCzZmPjtPS62A,2387
+omdev/tools/json/processing.py,sha256=jMSkTmIccdVkT_Q6Jf8Q4AG4BQecQfrp8G2bEtsklg8,2387
 omdev/tools/json/rendering.py,sha256=TXNP8KBWN-zT2nx0_LArdd6Wmff550hw-RyuB4Ydcjc,2661
 omdev/tools/jsonview/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/jsonview/__main__.py,sha256=BF-MVWpPJJeQYUqJA48G395kxw0lEJnV-hRLV_F9G2A,173
@@ -324,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.dev424.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev424.dist-info/METADATA,sha256=4op3rDPil6eMw7DVQDINlO4nzTc0URmEiz4UU7113oQ,5100
-omdev-0.0.0.dev424.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev424.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev424.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev424.dist-info/RECORD,,
+omdev-0.0.0.dev426.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev426.dist-info/METADATA,sha256=bwgToHy-W1XPH24LhesMVzVqCdhIHz0bj7sEIU0talU,5100
+omdev-0.0.0.dev426.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev426.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev426.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev426.dist-info/RECORD,,

omdev/tools/antlr/__main__.py

@@ -1,11 +0,0 @@
-from ...cli import CliModule
-
-
-# @omlish-manifest
-_CLI_MODULE = CliModule('antlr', __name__)
-
-
-if __name__ == '__main__':
-    from .cli import _main  # noqa
-
-    _main()