omdev 0.0.0.dev322__tar.gz → 0.0.0.dev324__tar.gz

{omdev-0.0.0.dev322/omdev.egg-info → omdev-0.0.0.dev324}/PKG-INFO

@@ -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 → omdev-0.0.0.dev324}/omdev/__about__.py

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

{omdev-0.0.0.dev322 → omdev-0.0.0.dev324}/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-0.0.0.dev322 → omdev-0.0.0.dev324}/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-0.0.0.dev324/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-0.0.0.dev322 → omdev-0.0.0.dev324}/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-0.0.0.dev322 → omdev-0.0.0.dev324}/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-0.0.0.dev322 → omdev-0.0.0.dev324}/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-0.0.0.dev322 → omdev-0.0.0.dev324}/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-0.0.0.dev322 → omdev-0.0.0.dev324}/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-0.0.0.dev322 → omdev-0.0.0.dev324}/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 → omdev-0.0.0.dev324/omdev.egg-info}/PKG-INFO

@@ -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 → omdev-0.0.0.dev324}/omdev.egg-info/SOURCES.txt

@@ -179,6 +179,7 @@ omdev/manifests/dumping.py
 omdev/manifests/main.py
 omdev/mypy/__init__.py
 omdev/mypy/debug.py
+omdev/mypy/report.py
 omdev/oci/__init__.py
 omdev/oci/building.py
 omdev/oci/compression.py

{omdev-0.0.0.dev322 → omdev-0.0.0.dev324}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev322
+omlish==0.0.0.dev324
 
 [all]
 black~=25.1
@@ -8,7 +8,7 @@ docutils~=0.21
 markdown-it-py~=3.0
 mdit-py-plugins~=0.4
 pygments~=2.19
-mypy~=1.15
+mypy~=1.16
 gprof2dot~=2025.4
 prompt-toolkit~=3.0
 segno~=1.6
@@ -27,7 +27,7 @@ mdit-py-plugins~=0.4
 pygments~=2.19
 
 [mypy]
-mypy~=1.15
+mypy~=1.16
 
 [prof]
 gprof2dot~=2025.4

{omdev-0.0.0.dev322 → omdev-0.0.0.dev324}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev322'
+version = '0.0.0.dev324'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev322',
+    'omlish == 0.0.0.dev324',
 ]
 
 [project.optional-dependencies]
@@ -34,7 +34,7 @@ all = [
     'markdown-it-py ~= 3.0',
     'mdit-py-plugins ~= 0.4',
     'pygments ~= 2.19',
-    'mypy ~= 1.15',
+    'mypy ~= 1.16',
     'gprof2dot ~= 2025.4',
     'prompt-toolkit ~= 3.0',
     'segno ~= 1.6',
@@ -53,7 +53,7 @@ doc = [
     'pygments ~= 2.19',
 ]
 mypy = [
-    'mypy ~= 1.15',
+    'mypy ~= 1.16',
 ]
 prof = [
     'gprof2dot ~= 2025.4',