omdev 0.0.0.dev322__py3-none-any.whl → 0.0.0.dev324__py3-none-any.whl

omdev/__about__.py

@@ -31,7 +31,7 @@ class Project(ProjectBase):
         ],
 
         'mypy': [
-            'mypy ~= 1.15',
+            'mypy ~= 1.16',
         ],
 
         'prof': [

omdev/cache/data/cache.py

@@ -87,11 +87,11 @@ def _url_retrieve(
     if size >= 0 and read < size:
         raise urllib.error.ContentTooShortError(
             f'retrieval incomplete: got only {read} out of {size} bytes',
-            result,  # type: ignore
+            result,
         )
 
     success = True
-    return result  # type: ignore
+    return result
 
 
 class Cache:

omdev/mypy/debug.py

@@ -3,6 +3,9 @@ import re
 import sys
 
 
+##
+
+
 def _is_instance_or_subclass(obj, cls):
     return (isinstance(obj, type) and issubclass(obj, cls)) or isinstance(obj, cls)
 
@@ -11,44 +14,57 @@ class MypyDebugPathFinder(importlib.machinery.PathFinder):
     @classmethod
     def _get_spec(cls, fullname, path, target=None):  # noqa
         namespace_path = []
+
         for entry in path:
             if not isinstance(entry, (str, bytes)):
                 continue
+
             finder = cls._path_importer_cache(entry)  # type: ignore  # noqa
             if finder is not None:
                 if isinstance(finder, importlib.machinery.FileFinder):
                     finder = importlib.machinery.FileFinder(
                         finder.path,
                         *[
-                            (i, [s]) for s, i in finder._loaders  # type: ignore  # noqa
+                            (i, [s])
+                            for s, i in finder._loaders  # type: ignore  # noqa
                             if not _is_instance_or_subclass(i, importlib.machinery.ExtensionFileLoader)
                         ],
                     )
+
                 if hasattr(finder, 'find_spec'):
                     spec = finder.find_spec(fullname, target)
                 else:
                     spec = cls._legacy_get_spec(fullname, finder)  # type: ignore  # noqa
+
                 if spec is None:
                     continue
+
                 if spec.loader is not None:
                     return spec
+
                 portions = spec.submodule_search_locations
                 if portions is None:
                     raise ImportError('spec missing loader')
+
                 namespace_path.extend(portions)
+
         return None
 
     @classmethod
     def find_spec(cls, fullname, path=None, target=None):  # noqa
         if not fullname.startswith('mypy.') and fullname != 'mypy':
             return None
+
         if path is None:
             path = sys.path
+
         spec = cls._get_spec(fullname, path, target)
         if spec is None:
             return None
+
         elif spec.loader is None:
             namespace_path = spec.submodule_search_locations
+
             if namespace_path:
                 spec.origin = None
                 spec.submodule_search_locations = importlib.machinery._NamespacePath(  # type: ignore  # noqa
@@ -57,29 +73,50 @@ class MypyDebugPathFinder(importlib.machinery.PathFinder):
                     cls._get_spec,
                 )
                 return spec
+
             else:
                 return None
+
         else:
             return spec
 
 
-def _main():
+def install_debug_path_finder() -> None:
     for i, e in enumerate(sys.meta_path):  # noqa
         if _is_instance_or_subclass(e, importlib.machinery.PathFinder):
             break
+
     sys.meta_path.insert(i, MypyDebugPathFinder)  # noqa
     sys.path_importer_cache.clear()
     importlib.invalidate_caches()
 
+
+##
+
+
+def run_mypy_main(
+        *,
+        show_traceback: bool = False,
+) -> None:
     from mypy.__main__ import console_entry  # noqa
 
     sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
 
-    if not any(k in sys.argv[1:] for k in ['--show-traceback', '--tb']):
-        sys.argv.insert(1, '--show-traceback')
+    if show_traceback:
+        if not any(k in sys.argv[1:] for k in ['--show-traceback', '--tb']):
+            sys.argv.insert(1, '--show-traceback')
 
     console_entry()
 
 
+##
+
+
+def _main() -> None:
+    install_debug_path_finder()
+
+    run_mypy_main(show_traceback=True)
+
+
 if __name__ == '__main__':
     _main()

omdev/mypy/report.py

@@ -0,0 +1,82 @@
+"""
+TODO:
+ - alt mode: --output=json, subprocess / tee
+"""
+import collections
+import dataclasses as dc
+import typing as ta
+
+from .debug import install_debug_path_finder
+from .debug import run_mypy_main
+
+
+if ta.TYPE_CHECKING:
+    import mypy.build
+    import mypy.errors
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class JsonOutputError:
+    file: str
+    line: int
+    column: int
+    message: str
+    hint: ta.Any | None
+    code: str
+    severity: str  # 'error' | 'note'
+
+
+##
+
+
+def _report_build_result(
+        result: 'mypy.build.BuildResult',
+) -> None:
+    errors: ta.Sequence[mypy.errors.ErrorInfo] = [
+        e
+        for es in result.manager.errors.error_info_map.values()
+        for e in es
+    ]
+    if errors:
+        count_by_code = collections.Counter(
+            e.code.code
+            for e in errors
+            if e.code is not None
+        )
+
+        print()
+        max_code_len = max(map(len, count_by_code))
+        for code, count in sorted(count_by_code.items(), key=lambda kv: -kv[1]):
+            print(f'{code.rjust(max_code_len)} : {count}')
+        print()
+
+
+##
+
+
+def _main() -> None:
+    install_debug_path_finder()
+
+    ##
+
+    import mypy.main
+
+    old_run_build = mypy.main.run_build
+
+    def new_run_build(*args, **kwargs):
+        ret = old_run_build(*args, **kwargs)
+        _report_build_result(ta.cast('mypy.build.BuildResult', ret[0]))
+        return ret
+
+    mypy.main.run_build = new_run_build
+
+    ##
+
+    run_mypy_main()
+
+
+if __name__ == '__main__':
+    _main()

omdev/packaging/specifiers.py

@@ -190,7 +190,7 @@ class Specifier(BaseSpecifier):
 
         self._prereleases = prereleases
 
-    @property  # type: ignore
+    @property
     def prereleases(self) -> bool:
         if self._prereleases is not None:
             return self._prereleases

omdev/py/scripts/importtrace.py

@@ -210,7 +210,7 @@ class ImportTracer:
 
         for child in node.children:
             seq = self._fixup_node(child, depth=depth + 1, seq=seq + 1)
-            node.child_stats += child.stats  # type: ignore
+            node.child_stats += child.stats
 
         node.self_stats = node.stats - node.child_stats  # type: ignore
         return seq

omdev/scripts/ci.py

@@ -1797,7 +1797,7 @@ class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
         self._underlying.set_name(name)
 
     @property
-    def name(self):
+    def name(self):  # type: ignore[override]
         return self._underlying.name
 
     @property

omdev/scripts/interp.py

@@ -1739,7 +1739,7 @@ class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
         self._underlying.set_name(name)
 
     @property
-    def name(self):
+    def name(self):  # type: ignore[override]
         return self._underlying.name
 
     @property
@@ -1972,7 +1972,7 @@ class Specifier(BaseSpecifier):
 
         self._prereleases = prereleases
 
-    @property  # type: ignore
+    @property
     def prereleases(self) -> bool:
         if self._prereleases is not None:
             return self._prereleases

omdev/scripts/pyproject.py

@@ -3203,7 +3203,7 @@ class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
         self._underlying.set_name(name)
 
     @property
-    def name(self):
+    def name(self):  # type: ignore[override]
         return self._underlying.name
 
     @property
@@ -3667,7 +3667,7 @@ class Specifier(BaseSpecifier):
 
         self._prereleases = prereleases
 
-    @property  # type: ignore
+    @property
     def prereleases(self) -> bool:
         if self._prereleases is not None:
             return self._prereleases

omdev/tools/json/formats.py

@@ -1,12 +1,14 @@
 """
 TODO:
  - options lol - csv header, newline, etc
+ - edn
 """
 import dataclasses as dc
 import enum
 import json
 import typing as ta
 
+from omlish import check
 from omlish import lang
 
 
@@ -44,6 +46,12 @@ class Format:
     load: ta.Callable[[ta.TextIO], ta.Any]
 
 
+def _load_xml(f: ta.TextIO) -> dict[str, ta.Any]:
+    tree = xml.parse_tree(f.read())
+    sel = xml.build_simple_element(check.not_none(tree.getroot()))
+    return sel.se_dict()
+
+
 class Formats(enum.Enum):
     JSON = Format(['json'], json.load)
 
@@ -59,7 +67,7 @@ class Formats(enum.Enum):
 
     PY = Format(['py', 'python', 'repr'], lambda f: ast.literal_eval(f.read()))
 
-    XML = Format(['xml'], lambda f: xml.build_simple_element(xml.parse_tree(f.read()).getroot()).se_dict())
+    XML = Format(['xml'], _load_xml)
 
     CSV = Format(['csv'], lambda f: list(csv.DictReader(f)))
     TSV = Format(['tsv'], lambda f: list(csv.DictReader(f, delimiter='\t')))

{omdev-0.0.0.dev322.dist-info → omdev-0.0.0.dev324.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev322
+Version: 0.0.0.dev324
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev322
+Requires-Dist: omlish==0.0.0.dev324
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"
@@ -21,7 +21,7 @@ Requires-Dist: docutils~=0.21; extra == "all"
 Requires-Dist: markdown-it-py~=3.0; extra == "all"
 Requires-Dist: mdit-py-plugins~=0.4; extra == "all"
 Requires-Dist: pygments~=2.19; extra == "all"
-Requires-Dist: mypy~=1.15; extra == "all"
+Requires-Dist: mypy~=1.16; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
@@ -36,7 +36,7 @@ Requires-Dist: markdown-it-py~=3.0; extra == "doc"
 Requires-Dist: mdit-py-plugins~=0.4; extra == "doc"
 Requires-Dist: pygments~=2.19; extra == "doc"
 Provides-Extra: mypy
-Requires-Dist: mypy~=1.15; extra == "mypy"
+Requires-Dist: mypy~=1.16; extra == "mypy"
 Provides-Extra: prof
 Requires-Dist: gprof2dot~=2025.4; extra == "prof"
 Provides-Extra: ptk

{omdev-0.0.0.dev322.dist-info → omdev-0.0.0.dev324.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omdev/.manifests.json,sha256=7rHwJQCTz0jmkxij_rlIAw0D1A38Rb3QqcmJNiRIhOM,11257
-omdev/__about__.py,sha256=16xa_1BdZanTpZbkjAOQ11_x5kJcb1m1tKdvb06J7VI,1202
+omdev/__about__.py,sha256=2_6pQyjxqAspvwBSJUWQgdBBcGaDO3zX8yETLaspUQE,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
 omdev/imgur.py,sha256=4XolajBnAJ1U2zvT6Y0fiUyBi_a8G9arXffvPxf3w-M,3103
@@ -27,7 +27,7 @@ omdev/cache/compute/storage.py,sha256=woCUqHg8ZrwLEejRG3zu1L5ZXxGNNXveh3E8FnlEkj
 omdev/cache/compute/types.py,sha256=dW6S1g_-MklWf8JDPXFMamuOZinjKFOlonfMyWg4L3o,2645
 omdev/cache/data/__init__.py,sha256=SQXtugLceRif463rcoklpQ33pxYLgEIm0xiI6NvOI6M,301
 omdev/cache/data/actions.py,sha256=Mv7eXeZuohCjQLpmLyvqvGjjBacXIvTYzIRMVpEh-zM,1037
-omdev/cache/data/cache.py,sha256=aZJotj9kpVHBK7O0UdqMdeV7PtCqf9Rd8tqIwgWtQlQ,7664
+omdev/cache/data/cache.py,sha256=oveyGl6gfTmQ4fKVO-NbB5Zx4rmEcti3BdZIvv5C6CU,7632
 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=4BparztsMZo9DDVVPhv6iv5g4kK7QAi8Vqtj3PbKkco,989
@@ -168,7 +168,8 @@ omdev/manifests/build.py,sha256=1Ah6NhNylAT-bIfDlKDOVlfitxe9UNYPudOwxO0s1aY,1002
 omdev/manifests/dumping.py,sha256=mYXO58oXWQdTIn7A9XTnGv2-3LRPvO_uQmqkwPn9cMw,3470
 omdev/manifests/main.py,sha256=7zRlyE0BDPqITEbChlTBRGulAvG1nUZPHXrerNExriE,2126
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/mypy/debug.py,sha256=iTPfTQj9RO8k8GKqhS_lMa8QNQpFpXC5RH1SUq8yMYY,3002
+omdev/mypy/debug.py,sha256=VskRcr9trNhyPG2ErZZ7IX_v1DLKTLBOjp34o-fEWaM,3294
+omdev/mypy/report.py,sha256=ZpBWibI5PBK28DgGhx5tLHvuL-qdcmG1MT4HSWdFsnc,1515
 omdev/oci/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/oci/building.py,sha256=g1TY-a2eHgEamYv0mt1L6rOevwOgdp_cW1xdVdjDzTw,5695
 omdev/oci/compression.py,sha256=5hs7u0hImsm22GcQBHGYnP6g9dr-lBZ3E_PzdNVD4WY,134
@@ -188,7 +189,7 @@ omdev/packaging/marshal.py,sha256=YMXXkoWkjYoOAyD6RHsmaHGwlIsDQjnMtfa6e9-l4_A,23
 omdev/packaging/names.py,sha256=-a7AykFPVR1i6EYJepbe3ABRrZQ_tPPmK5olzbn9HLI,2528
 omdev/packaging/requires.py,sha256=PGbH1m17lkFEBvSp3znF-o9dmgFrRCM_PHBl0ARa6lw,15679
 omdev/packaging/revisions.py,sha256=3u-6vY0mq01tgRENcncozsMLXSgtaQWXuQp0kRkEHvg,4986
-omdev/packaging/specifiers.py,sha256=X8xOcwRLXTQYx5mYAS3ijqoTLlCtYESyUu4fX9bvblY,17447
+omdev/packaging/specifiers.py,sha256=S4WZwSFaXz5LB8BiaXcowo1OFXEuY0YsXVxgpLfsl3Y,17431
 omdev/packaging/versions.py,sha256=K4eUOUvLmYcR4aeUywekeWTBqAvZchrIxLf7dl07MS4,12261
 omdev/packaging/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/precheck/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -233,7 +234,7 @@ omdev/py/docstrings/rest.py,sha256=c2xPYg_W01W9eYY_KLKX69E4qu4jpkgUshi5K5EyVv8,5
 omdev/py/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/py/scripts/bumpversion.py,sha256=2NnfRsJiZNTg-LubIwXCm2vklG7-kIR8_xFUEZNxtiY,1119
 omdev/py/scripts/execstat.py,sha256=eyk_TCeJt-xtMGqaW3X7pnEBe7JZbXrTYsODn_m6lfM,3869
-omdev/py/scripts/importtrace.py,sha256=TqALDqR6ODpbMyAtk2q84Xrvmn0UPGaKAdcNB7E62bA,14035
+omdev/py/scripts/importtrace.py,sha256=ry2PwV4h8KvFUHm4pIKN76TAwxC5lFT1A3CzccXlj2o,14019
 omdev/py/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/py/tools/importscan.py,sha256=4dCH0coX0OqNwesteKaTE8GxuSfLhgXYQlzNUXLiSNY,4640
 omdev/py/tools/mkrelimp.py,sha256=L6TksQixUc_DQGXKFMOKnYJ-JixeP3ldgkDqHeEs2Ww,4044
@@ -250,9 +251,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=1IeNGWCyHtonK1PHaKETW7IqCyXMkIkMafXUVlFCtQo,357043
-omdev/scripts/interp.py,sha256=ByjO0DdnYF8VDYu04v6oIops4CknA8bUTOmcbjmlXGk,155590
-omdev/scripts/pyproject.py,sha256=psPWxTp0FAPrRTMEoLTvHOsbv15fkIf_Lh8LBl3pYZE,265071
+omdev/scripts/ci.py,sha256=UMyGSv7_16YaG-rrrqnMU2bLJg-Vp74WriB_vmtfW6U,357069
+omdev/scripts/interp.py,sha256=eI43dKT99L0LniXC6PDYou2Y5fOU-lrVyElVvPYu92s,155600
+omdev/scripts/pyproject.py,sha256=7vcQBcXd64vnAiVdC9wQ-4z1jGf-un7xyKrt-K_tVwA,265081
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -286,7 +287,7 @@ omdev/tools/git/messages.py,sha256=NWztIK0nAKJIOVzuVQcR_5LHZUgqyVkrOlpl7dFLMdU,2
 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=WQ8VQ9EkGD6IeIuUci8hLPwfx6y2B8ZzFlTTizwwKXU,9598
-omdev/tools/json/formats.py,sha256=RgtPdcs294o9n9czjafHppg1iSzD-olsIc3v8ApM9Os,1908
+omdev/tools/json/formats.py,sha256=0IXHUIkcbKnTVP0a53wYWsBMpfVtGTrHN04zRAs2JZo,2049
 omdev/tools/json/io.py,sha256=sfj2hJS9Hy3aUR8a_lLzOrYcmL9fSKyvOHiofdUASsI,1427
 omdev/tools/json/parsing.py,sha256=csoTuG2C2AJB7PgG4TKt2XqdiBAQXtpXRWBxoMkk14g,2103
 omdev/tools/json/processing.py,sha256=iFm5VqaxJ97WHaun2ed7NEjMxhFeJqf28bLNfoDJft0,1209
@@ -294,9 +295,9 @@ omdev/tools/json/rendering.py,sha256=3HhdlKSetS6iK1tjF2aILzsl8Mb3D8wW92vYwGpRdVA
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev322.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev322.dist-info/METADATA,sha256=W2vWvN3Vn1arS7DSnKfNgJXZZN8e584bozi9b0sKUvE,1674
-omdev-0.0.0.dev322.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev322.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev322.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev322.dist-info/RECORD,,
+omdev-0.0.0.dev324.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev324.dist-info/METADATA,sha256=in-kTKRjJPv5TbNAvuzjie-QDRSqE7zfOG-7hHk4-Fc,1674
+omdev-0.0.0.dev324.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev324.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev324.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev324.dist-info/RECORD,,