omdev 0.0.0.dev402__tar.gz → 0.0.0.dev404__tar.gz

{omdev-0.0.0.dev402/omdev.egg-info → omdev-0.0.0.dev404}/PKG-INFO

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

{omdev-0.0.0.dev402 → omdev-0.0.0.dev404}/omdev/.manifests.json

@@ -236,7 +236,7 @@
     "module": ".py.scripts.execstat",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/scripts/execstat.py",
-    "line": 84,
+    "line": 86,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/execstat",

{omdev-0.0.0.dev402 → omdev-0.0.0.dev404}/omdev/cli/types.py

@@ -1,4 +1,5 @@
 # ruff: noqa: UP007 UP045
+# @omlish-lite
 import dataclasses as dc
 import typing as ta
 

{omdev-0.0.0.dev402 → omdev-0.0.0.dev404}/omdev/manifests/_dumping.py

@@ -610,24 +610,40 @@ _GENERIC_ALIAS_TYPES = (
 )
 
 
-def is_generic_alias(obj, *, origin: ta.Any = None) -> bool:
+def is_generic_alias(obj: ta.Any, *, origin: ta.Any = None) -> bool:
     return (
         isinstance(obj, _GENERIC_ALIAS_TYPES) and
         (origin is None or ta.get_origin(obj) is origin)
     )
 
 
-is_union_alias = functools.partial(is_generic_alias, origin=ta.Union)
 is_callable_alias = functools.partial(is_generic_alias, origin=ta.Callable)
 
 
 ##
 
 
+_UNION_ALIAS_ORIGINS = frozenset([
+    ta.get_origin(ta.Optional[int]),
+    *(
+        [
+            ta.get_origin(int | None),
+            ta.get_origin(getattr(ta, 'TypeVar')('_T') | None),
+        ] if sys.version_info >= (3, 10) else ()
+    ),
+])
+
+
+def is_union_alias(obj: ta.Any) -> bool:
+    return ta.get_origin(obj) in _UNION_ALIAS_ORIGINS
+
+
+#
+
+
 def is_optional_alias(spec: ta.Any) -> bool:
     return (
-        isinstance(spec, _GENERIC_ALIAS_TYPES) and  # noqa
-        ta.get_origin(spec) is ta.Union and
+        is_union_alias(spec) and
         len(ta.get_args(spec)) == 2 and
         any(a in (None, type(None)) for a in ta.get_args(spec))
     )
@@ -1304,32 +1320,32 @@ class ObjMarshalerManager:
                 [e] = ta.get_args(ty)
                 return IterableObjMarshaler(st, rec(e))
 
-            if is_union_alias(ty):
-                uts = frozenset(ta.get_args(ty))
-                if None in uts or type(None) in uts:
-                    is_opt = True
-                    uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
-                else:
-                    is_opt = False
+        if is_union_alias(ty):
+            uts = frozenset(ta.get_args(ty))
+            if None in uts or type(None) in uts:
+                is_opt = True
+                uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
+            else:
+                is_opt = False
 
-                um: ObjMarshaler
-                if not uts:
-                    raise TypeError(ty)
-                elif len(uts) == 1:
-                    um = rec(check.single(uts))
+            um: ObjMarshaler
+            if not uts:
+                raise TypeError(ty)
+            elif len(uts) == 1:
+                um = rec(check.single(uts))
+            else:
+                pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
+                np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
+                if not np_uts:
+                    um = PrimitiveUnionObjMarshaler(pt)
+                elif len(np_uts) == 1:
+                    um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
                 else:
-                    pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
-                    np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
-                    if not np_uts:
-                        um = PrimitiveUnionObjMarshaler(pt)
-                    elif len(np_uts) == 1:
-                        um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
-                    else:
-                        raise TypeError(ty)
-
-                if is_opt:
-                    um = OptionalObjMarshaler(um)
-                return um
+                    raise TypeError(ty)
+
+            if is_opt:
+                um = OptionalObjMarshaler(um)
+            return um
 
         raise TypeError(ty)
 

{omdev-0.0.0.dev402 → omdev-0.0.0.dev404}/omdev/py/scripts/execstat.py

@@ -3,9 +3,11 @@
 import argparse
 import inspect
 import json
+import os.path
 import statistics
 import subprocess
 import sys
+import tempfile
 
 
 ##
@@ -102,6 +104,8 @@ def _main() -> None:
 
     parser.add_argument('-P', '--precision', type=int, default=3)
 
+    parser.add_argument('--out-dir')
+
     parser.add_argument('-x', '--exe')
 
     args = parser.parse_args()
@@ -116,8 +120,13 @@ def _main() -> None:
     if (exe := args.exe) is None:
         exe = sys.executable
 
+    if (out_dir := args.out_dir) is None:
+        out_dir = tempfile.mkdtemp()
+
     results = []
     for i in range(n):
+        out_file = os.path.join(out_dir, f'{str(i).zfill(len(str(n)))}.json')
+
         run_kw = dict(
             src=args.src,
             setup=args.setup,
@@ -133,11 +142,15 @@ def _main() -> None:
         payload = '\n'.join([
             inspect.getsource(_run),
             f'dct = _run(**{run_kw!r})',
-            'import json',
-            'print(json.dumps(dct))',
+            f'import json',
+            f'with open({out_file!r}, "w") as f:',  # noqa
+            f'    print(f.write(json.dumps(dct)))',
         ])
 
-        result = json.loads(subprocess.check_output([exe, '-c', payload]))
+        subprocess.check_call([exe, '-c', payload])
+
+        with open(out_file) as f:
+            result = json.load(f)
 
         results.append(result)
 

{omdev-0.0.0.dev402 → omdev-0.0.0.dev404}/omdev/scripts/ci.py

@@ -1433,24 +1433,40 @@ _GENERIC_ALIAS_TYPES = (
 )
 
 
-def is_generic_alias(obj, *, origin: ta.Any = None) -> bool:
+def is_generic_alias(obj: ta.Any, *, origin: ta.Any = None) -> bool:
     return (
         isinstance(obj, _GENERIC_ALIAS_TYPES) and
         (origin is None or ta.get_origin(obj) is origin)
     )
 
 
-is_union_alias = functools.partial(is_generic_alias, origin=ta.Union)
 is_callable_alias = functools.partial(is_generic_alias, origin=ta.Callable)
 
 
 ##
 
 
+_UNION_ALIAS_ORIGINS = frozenset([
+    ta.get_origin(ta.Optional[int]),
+    *(
+        [
+            ta.get_origin(int | None),
+            ta.get_origin(getattr(ta, 'TypeVar')('_T') | None),
+        ] if sys.version_info >= (3, 10) else ()
+    ),
+])
+
+
+def is_union_alias(obj: ta.Any) -> bool:
+    return ta.get_origin(obj) in _UNION_ALIAS_ORIGINS
+
+
+#
+
+
 def is_optional_alias(spec: ta.Any) -> bool:
     return (
-        isinstance(spec, _GENERIC_ALIAS_TYPES) and  # noqa
-        ta.get_origin(spec) is ta.Union and
+        is_union_alias(spec) and
         len(ta.get_args(spec)) == 2 and
         any(a in (None, type(None)) for a in ta.get_args(spec))
     )
@@ -2830,6 +2846,7 @@ def _get_argparse_arg_ann_kwargs(ann: ta.Any) -> ta.Mapping[str, ta.Any]:
 class _ArgparseCliAnnotationBox:
     def __init__(self, annotations: ta.Mapping[str, ta.Any]) -> None:
         super().__init__()
+
         self.__annotations__ = annotations  # type: ignore
 
 
@@ -5269,32 +5286,32 @@ class ObjMarshalerManager:
                 [e] = ta.get_args(ty)
                 return IterableObjMarshaler(st, rec(e))
 
-            if is_union_alias(ty):
-                uts = frozenset(ta.get_args(ty))
-                if None in uts or type(None) in uts:
-                    is_opt = True
-                    uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
-                else:
-                    is_opt = False
+        if is_union_alias(ty):
+            uts = frozenset(ta.get_args(ty))
+            if None in uts or type(None) in uts:
+                is_opt = True
+                uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
+            else:
+                is_opt = False
 
-                um: ObjMarshaler
-                if not uts:
-                    raise TypeError(ty)
-                elif len(uts) == 1:
-                    um = rec(check.single(uts))
+            um: ObjMarshaler
+            if not uts:
+                raise TypeError(ty)
+            elif len(uts) == 1:
+                um = rec(check.single(uts))
+            else:
+                pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
+                np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
+                if not np_uts:
+                    um = PrimitiveUnionObjMarshaler(pt)
+                elif len(np_uts) == 1:
+                    um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
                 else:
-                    pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
-                    np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
-                    if not np_uts:
-                        um = PrimitiveUnionObjMarshaler(pt)
-                    elif len(np_uts) == 1:
-                        um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
-                    else:
-                        raise TypeError(ty)
+                    raise TypeError(ty)
 
-                if is_opt:
-                    um = OptionalObjMarshaler(um)
-                return um
+            if is_opt:
+                um = OptionalObjMarshaler(um)
+            return um
 
         raise TypeError(ty)
 

{omdev-0.0.0.dev402 → omdev-0.0.0.dev404}/omdev/scripts/interp.py

@@ -1301,24 +1301,40 @@ _GENERIC_ALIAS_TYPES = (
 )
 
 
-def is_generic_alias(obj, *, origin: ta.Any = None) -> bool:
+def is_generic_alias(obj: ta.Any, *, origin: ta.Any = None) -> bool:
     return (
         isinstance(obj, _GENERIC_ALIAS_TYPES) and
         (origin is None or ta.get_origin(obj) is origin)
     )
 
 
-is_union_alias = functools.partial(is_generic_alias, origin=ta.Union)
 is_callable_alias = functools.partial(is_generic_alias, origin=ta.Callable)
 
 
 ##
 
 
+_UNION_ALIAS_ORIGINS = frozenset([
+    ta.get_origin(ta.Optional[int]),
+    *(
+        [
+            ta.get_origin(int | None),
+            ta.get_origin(getattr(ta, 'TypeVar')('_T') | None),
+        ] if sys.version_info >= (3, 10) else ()
+    ),
+])
+
+
+def is_union_alias(obj: ta.Any) -> bool:
+    return ta.get_origin(obj) in _UNION_ALIAS_ORIGINS
+
+
+#
+
+
 def is_optional_alias(spec: ta.Any) -> bool:
     return (
-        isinstance(spec, _GENERIC_ALIAS_TYPES) and  # noqa
-        ta.get_origin(spec) is ta.Union and
+        is_union_alias(spec) and
         len(ta.get_args(spec)) == 2 and
         any(a in (None, type(None)) for a in ta.get_args(spec))
     )
@@ -2441,6 +2457,7 @@ def _get_argparse_arg_ann_kwargs(ann: ta.Any) -> ta.Mapping[str, ta.Any]:
 class _ArgparseCliAnnotationBox:
     def __init__(self, annotations: ta.Mapping[str, ta.Any]) -> None:
         super().__init__()
+
         self.__annotations__ = annotations  # type: ignore
 
 

{omdev-0.0.0.dev402 → omdev-0.0.0.dev404}/omdev/scripts/pyproject.py

@@ -2731,24 +2731,40 @@ _GENERIC_ALIAS_TYPES = (
 )
 
 
-def is_generic_alias(obj, *, origin: ta.Any = None) -> bool:
+def is_generic_alias(obj: ta.Any, *, origin: ta.Any = None) -> bool:
     return (
         isinstance(obj, _GENERIC_ALIAS_TYPES) and
         (origin is None or ta.get_origin(obj) is origin)
     )
 
 
-is_union_alias = functools.partial(is_generic_alias, origin=ta.Union)
 is_callable_alias = functools.partial(is_generic_alias, origin=ta.Callable)
 
 
 ##
 
 
+_UNION_ALIAS_ORIGINS = frozenset([
+    ta.get_origin(ta.Optional[int]),
+    *(
+        [
+            ta.get_origin(int | None),
+            ta.get_origin(getattr(ta, 'TypeVar')('_T') | None),
+        ] if sys.version_info >= (3, 10) else ()
+    ),
+])
+
+
+def is_union_alias(obj: ta.Any) -> bool:
+    return ta.get_origin(obj) in _UNION_ALIAS_ORIGINS
+
+
+#
+
+
 def is_optional_alias(spec: ta.Any) -> bool:
     return (
-        isinstance(spec, _GENERIC_ALIAS_TYPES) and  # noqa
-        ta.get_origin(spec) is ta.Union and
+        is_union_alias(spec) and
         len(ta.get_args(spec)) == 2 and
         any(a in (None, type(None)) for a in ta.get_args(spec))
     )
@@ -3151,6 +3167,16 @@ class Func3(ta.Generic[A0, A1, A2, T]):
         return self.fn(a0, a1, a2)
 
 
+##
+
+
+_TYPING_ANNOTATIONS_ATTR = '__annotate__' if sys.version_info >= (3, 14) else '__annotations__'
+
+
+def typing_annotations_attr() -> str:
+    return _TYPING_ANNOTATIONS_ATTR
+
+
 ########################################
 # ../../../omlish/logs/filters.py
 
@@ -4233,6 +4259,7 @@ def _get_argparse_arg_ann_kwargs(ann: ta.Any) -> ta.Mapping[str, ta.Any]:
 class _ArgparseCliAnnotationBox:
     def __init__(self, annotations: ta.Mapping[str, ta.Any]) -> None:
         super().__init__()
+
         self.__annotations__ = annotations  # type: ignore
 
 
@@ -6024,32 +6051,32 @@ class ObjMarshalerManager:
                 [e] = ta.get_args(ty)
                 return IterableObjMarshaler(st, rec(e))
 
-            if is_union_alias(ty):
-                uts = frozenset(ta.get_args(ty))
-                if None in uts or type(None) in uts:
-                    is_opt = True
-                    uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
-                else:
-                    is_opt = False
+        if is_union_alias(ty):
+            uts = frozenset(ta.get_args(ty))
+            if None in uts or type(None) in uts:
+                is_opt = True
+                uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
+            else:
+                is_opt = False
 
-                um: ObjMarshaler
-                if not uts:
-                    raise TypeError(ty)
-                elif len(uts) == 1:
-                    um = rec(check.single(uts))
+            um: ObjMarshaler
+            if not uts:
+                raise TypeError(ty)
+            elif len(uts) == 1:
+                um = rec(check.single(uts))
+            else:
+                pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
+                np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
+                if not np_uts:
+                    um = PrimitiveUnionObjMarshaler(pt)
+                elif len(np_uts) == 1:
+                    um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
                 else:
-                    pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
-                    np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
-                    if not np_uts:
-                        um = PrimitiveUnionObjMarshaler(pt)
-                    elif len(np_uts) == 1:
-                        um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
-                    else:
-                        raise TypeError(ty)
+                    raise TypeError(ty)
 
-                if is_opt:
-                    um = OptionalObjMarshaler(um)
-                return um
+            if is_opt:
+                um = OptionalObjMarshaler(um)
+            return um
 
         raise TypeError(ty)
 

{omdev-0.0.0.dev402 → omdev-0.0.0.dev404}/omdev/tools/git/messages.py

@@ -55,7 +55,7 @@ class StaticGitMessageGeneratorManifest(StaticModAttrManifest, GitMessageGenerat
 @cached.function
 def load_message_generator_manifests() -> ta.Sequence[GitMessageGeneratorManifest]:
     ldr = manifest_globals.GlobalManifestLoader.instance()
-    pkgs = ldr.scan_or_discover_packages(fallback_root_dir=os.getcwd())
+    pkgs = ldr.scan_or_discover_packages(fallback_root_dir=os.getcwd())  # FIXME
     mfs = ldr.load(*pkgs, only=[GitMessageGeneratorManifest])
     return [mf.value() for mf in mfs]
 

{omdev-0.0.0.dev402 → omdev-0.0.0.dev404/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev402 → omdev-0.0.0.dev404}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev402
+omlish==0.0.0.dev404
 
 [all]
 black~=25.1

{omdev-0.0.0.dev402 → omdev-0.0.0.dev404}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev402'
+version = '0.0.0.dev404'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev402',
+    'omlish == 0.0.0.dev404',
 ]
 
 [project.optional-dependencies]