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

omdev/{.manifests.json → .omlish-manifests.json}

@@ -73,7 +73,7 @@
   },
   {
     "module": ".imgur",
-    "attr": "_FOO_CLI_MODULE",
+    "attr": "_CLI_MODULE",
     "file": "omdev/imgur.py",
     "line": 136,
     "value": {
@@ -328,18 +328,6 @@
       }
     }
   },
-  {
-    "module": ".tools.antlr.__main__",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/tools/antlr/__main__.py",
-    "line": 4,
-    "value": {
-      "!.cli.types.CliModule": {
-        "name": "antlr",
-        "module": "omdev.tools.antlr.__main__"
-      }
-    }
-  },
   {
     "module": ".tools.cloc",
     "attr": "_CLI_MODULE",

omdev/ci/cache.py

@@ -18,7 +18,7 @@ import urllib.request
 from omlish.lite.abstract import Abstract
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 from omlish.os.temp import make_temp_file
 
 from .consts import CI_CACHE_VERSION
@@ -27,6 +27,9 @@ from .consts import CI_CACHE_VERSION
 CacheVersion = ta.NewType('CacheVersion', int)
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

omdev/ci/cli.py

@@ -22,7 +22,7 @@ from omlish.argparse.cli import argparse_arg
 from omlish.argparse.cli import argparse_cmd
 from omlish.lite.check import check
 from omlish.lite.inject import inj
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 from omlish.logs.standard import configure_standard_logging
 
 from .cache import DirectoryFileCache
@@ -35,6 +35,9 @@ from .requirements import build_requirements_hash
 from .shell import ShellCmd
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

omdev/ci/docker/cacheserved/cache.py

@@ -10,11 +10,11 @@ from omlish.asyncs.asyncio.sockets import asyncio_wait_until_can_connect
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.check import check
 from omlish.lite.json import json_dumps_compact
-from omlish.lite.logs import log
 from omlish.lite.marshal import marshal_obj
 from omlish.lite.marshal import unmarshal_obj
 from omlish.lite.timeouts import Timeout
 from omlish.lite.timeouts import TimeoutLike
+from omlish.logs.modules import get_module_logger
 
 from ....dataserver.server import DataServer
 from ....dataserver.targets import DataServerTarget
@@ -35,6 +35,9 @@ from .manifests import build_cache_served_docker_image_data_server_routes
 from .manifests import build_cache_served_docker_image_manifest
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

omdev/ci/docker/packing.py

@@ -8,7 +8,7 @@ from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import async_cached_nullary
 from omlish.lite.cached import cached_nullary
 from omlish.lite.contextmanagers import ExitStacked
-from omlish.logs.timing import log_timing_context
+from omlish.logs.utils import log_timing_context
 from omlish.os.temp import temp_dir_context
 
 from ...oci.building import BuiltOciImageIndexRepository

omdev/ci/github/api/clients.py

@@ -15,13 +15,16 @@ from omlish.http.urllib import NonRaisingUrllibErrorProcessor
 from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 from omlish.lite.json import json_dumps_compact
-from omlish.lite.logs import log
 from omlish.lite.timing import log_timing_context
+from omlish.logs.modules import get_module_logger
 
 from ...consts import CI_CACHE_VERSION
 from ..env import register_github_env_var
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

omdev/ci/github/api/v1/client.py

@@ -6,8 +6,8 @@ import urllib.parse
 import urllib.request
 
 from omlish.lite.check import check
-from omlish.lite.logs import log
 from omlish.lite.timing import log_timing_context
+from omlish.logs.modules import get_module_logger
 
 from ...env import register_github_env_var
 from ..clients import BaseGithubCacheClient
@@ -15,6 +15,9 @@ from ..clients import GithubCacheClient
 from .api import GithubCacheServiceV1
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

omdev/ci/github/api/v2/azure.py

@@ -13,8 +13,11 @@ import xml.etree.ElementTree as ET
 
 from omlish.asyncs.asyncio.utils import asyncio_wait_concurrent
 from omlish.lite.check import check
-from omlish.lite.logs import log
 from omlish.lite.timing import log_timing_context
+from omlish.logs.modules import get_module_logger
+
+
+log = get_module_logger(globals())  # noqa
 
 
 ##

omdev/ci/github/api/v2/client.py

@@ -5,8 +5,8 @@ import typing as ta
 import urllib.request
 
 from omlish.lite.check import check
-from omlish.lite.logs import log
 from omlish.lite.timing import log_timing_context
+from omlish.logs.modules import get_module_logger
 
 from ...env import register_github_env_var
 from ..clients import BaseGithubCacheClient
@@ -17,6 +17,9 @@ from .api import GithubCacheServiceV2ResponseT
 from .azure import AzureBlockBlobUploader
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

omdev/imgur.py

@@ -130,11 +130,11 @@ def _main() -> None:
 
             print(resp.data.link)
 
-    Cli()(exit=True)
+    Cli()(exit=True)  # noqa
 
 
 # @omlish-manifest
-_FOO_CLI_MODULE = CliModule('imgur', __name__)
+_CLI_MODULE = CliModule('imgur', __name__)
 
 
 if __name__ == '__main__':

omdev/interp/providers/standalone.py

@@ -33,7 +33,10 @@ import urllib.request
 
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
+
+
+log = get_module_logger(globals())  # noqa
 
 
 ##

omdev/manifests/_dumping.py

@@ -188,7 +188,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
 
@@ -963,13 +963,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']
 
 

omdev/manifests/building.py

@@ -39,7 +39,7 @@ from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.imports import import_attr
 from omlish.lite.json import json_dumps_pretty
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 from omlish.manifests.base import ModAttrManifest
 from omlish.manifests.globals import GlobalManifestLoader
 from omlish.manifests.types import Manifest
@@ -53,6 +53,9 @@ T = ta.TypeVar('T')
 ManifestDumperTarget = ta.Union['InlineManifestDumperTarget', 'AttrManifestDumperTarget']  # ta.TypeAlias
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
@@ -407,7 +410,7 @@ class ManifestBuilder:
         ])))
 
         if write:
-            with open(os.path.join(pkg_dir, '.manifests.json'), 'w') as f:  # noqa
+            with open(os.path.join(pkg_dir, '.omlish-manifests.json'), 'w') as f:  # noqa
                 f.write(json_dumps_pretty([dc.asdict(m) for m in manifests]))
                 f.write('\n')
 
@@ -425,7 +428,7 @@ def check_package_manifests(
     if not os.path.isdir(pkg_dir) or not os.path.isfile(os.path.join(pkg_dir, '__init__.py')):
         raise Exception(pkg_dir)
 
-    manifests_file = os.path.join(pkg_dir, '.manifests.json')
+    manifests_file = os.path.join(pkg_dir, '.omlish-manifests.json')
     if not os.path.isfile(manifests_file):
         raise Exception(f'No manifests file: {manifests_file}')
 

omdev/packaging/revisions.py

@@ -14,13 +14,16 @@ import zipfile
 
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 from omlish.logs.standard import configure_standard_logging
 
 from ..git.revisions import get_git_revision
 from .wheelfile import WheelFile
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

omdev/ptk/markdown/utils.py

@@ -40,7 +40,7 @@ def max_line_width(ft: ptk.StyleAndTextTuples) -> int:
     return max(ptk.fragment_list_width(line) for line in ptk.split_lines(ft))
 
 
-def fragment_list_to_words(fragments: ptk.StyleAndTextTuples) -> ta.Iterable[ptk.OneStyleAndTextTuple]:
+def fragment_list_to_words(fragments: ptk.StyleAndTextTuples) -> ta.Iterator[ptk.OneStyleAndTextTuple]:
     """Split formatted text into word fragments."""
 
     for style, string, *mouse_handler in fragments:

omdev/py/attrdocs.py

@@ -24,12 +24,12 @@ class AttrDoc:
     trailing_comment: str | None = None
     preceding_comment: str | None = None
 
-    __repr__ = lang.AttrRepr.of(
+    __repr__ = lang.attr_ops(
         'docstring',
         'trailing_comment',
         'preceding_comment',
-        value_filter=bool,
-    )
+        repr_filter=bool,
+    ).repr
 
 
 _EMPTY_ATTR_DOC = AttrDoc()

omdev/py/docstrings/numpydoc.py

@@ -74,7 +74,7 @@ class Section:
         dashes = '-' * len(self.title)
         return rf'^({self.title})\s*?\n{dashes}\s*$'
 
-    def parse(self, text: str) -> ta.Iterable[DocstringMeta]:
+    def parse(self, text: str) -> ta.Iterator[DocstringMeta]:
         """
         Parse ``DocstringMeta`` objects from the body of this section.
 
@@ -100,7 +100,7 @@ class _KVSection(Section, abc.ABC):
     def _parse_item(self, key: str, value: str) -> DocstringMeta:
         raise NotImplementedError
 
-    def parse(self, text: str) -> ta.Iterable[DocstringMeta]:
+    def parse(self, text: str) -> ta.Iterator[DocstringMeta]:
         for match, next_match in _pairwise(KV_PAT.finditer(text)):
             start = match.end()
             end = next_match.start() if next_match is not None else None
@@ -227,7 +227,7 @@ class YieldsSection(ReturnsSection):
 class DeprecationSection(_SphinxSection):
     """Parser for numpydoc "deprecation warning" sections."""
 
-    def parse(self, text: str) -> ta.Iterable[DocstringDeprecated]:
+    def parse(self, text: str) -> ta.Iterator[DocstringDeprecated]:
         version, desc, *_ = [*text.split(sep='\n', maxsplit=1), None, None]
 
         if desc is not None:
@@ -254,7 +254,7 @@ class ExamplesSection(Section):
                 [ 6586976, 22740995]])
     """
 
-    def parse(self, text: str) -> ta.Iterable[DocstringMeta]:
+    def parse(self, text: str) -> ta.Iterator[DocstringMeta]:
         """
         Parse ``DocstringExample`` objects from the body of this section.
 

omdev/py/tools/mkrelimp.py

@@ -32,7 +32,7 @@ def indexfn(
     return -1
 
 
-def interleave(sep: T, it: ta.Iterable[T]) -> ta.Iterable[T]:
+def interleave(sep: T, it: ta.Iterable[T]) -> ta.Iterator[T]:
     for i, e in enumerate(it):
         if i > 0:
             yield sep

omdev/pyproject/pkg.py

@@ -38,7 +38,7 @@ import typing as ta
 from omlish.formats.toml.writer import TomlWriter
 from omlish.lite.abstract import Abstract
 from omlish.lite.cached import cached_nullary
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 from omlish.subprocesses.sync import subprocesses
 
 from ..cexts.magic import CextMagic
@@ -46,6 +46,9 @@ from ..magic.find import find_magic_files
 from ..packaging.revisions import GitRevisionAdder
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
@@ -334,7 +337,7 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         #         '*.c',
         #         '*.cc',
         #         '*.h',
-        #         '.manifests.json',
+        #         '.omlish-manifests.json',
         #         'LICENSE',
         #     ],
         # }

omdev/pyproject/reqs.py

@@ -8,7 +8,10 @@ import tempfile
 import typing as ta
 
 from omlish.lite.cached import cached_nullary
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
+
+
+log = get_module_logger(globals())  # noqa
 
 
 ##

omdev/pyproject/venvs.py

@@ -5,7 +5,7 @@ import typing as ta
 
 from omlish.lite.cached import async_cached_nullary
 from omlish.lite.cached import cached_nullary
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 
 from ..interp.venvs import InterpVenv
 from ..interp.venvs import InterpVenvRequirementsProcessor
@@ -13,6 +13,9 @@ from .configs import VenvConfig
 from .reqs import RequirementsRewriter
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##