omlish 0.0.0.dev50__tar.gz → 0.0.0.dev52__tar.gz

{omlish-0.0.0.dev50/omlish.egg-info → omlish-0.0.0.dev52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev50
+Version: 0.0.0.dev52
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -27,7 +27,7 @@ Requires-Dist: psutil~=6.0; extra == "all"
 Requires-Dist: orjson~=3.10; extra == "all"
 Requires-Dist: ujson~=5.10; extra == "all"
 Requires-Dist: json5~=0.9; extra == "all"
-Requires-Dist: pyyaml~=5.0; extra == "all"
+Requires-Dist: pyyaml~=6.0; extra == "all"
 Requires-Dist: cbor2~=5.6; extra == "all"
 Requires-Dist: cloudpickle~=3.0; extra == "all"
 Requires-Dist: httpx[http2]~=0.27; extra == "all"
@@ -43,6 +43,13 @@ Requires-Dist: apsw~=3.46; extra == "all"
 Requires-Dist: sqlean.py~=3.45; python_version < "3.13" and extra == "all"
 Requires-Dist: duckdb~=1.1; extra == "all"
 Requires-Dist: pytest~=8.0; extra == "all"
+Requires-Dist: anyio~=4.6; extra == "all"
+Requires-Dist: sniffio~=1.3; extra == "all"
+Requires-Dist: asttokens~=2.4; extra == "all"
+Requires-Dist: executing~=2.1; extra == "all"
+Requires-Dist: orjson~=3.10; extra == "all"
+Requires-Dist: pyyaml~=6.0; extra == "all"
+Requires-Dist: wrapt~=1.14; extra == "all"
 Provides-Extra: async
 Requires-Dist: anyio~=4.6; extra == "async"
 Requires-Dist: sniffio~=1.3; extra == "async"
@@ -61,7 +68,7 @@ Provides-Extra: formats
 Requires-Dist: orjson~=3.10; extra == "formats"
 Requires-Dist: ujson~=5.10; extra == "formats"
 Requires-Dist: json5~=0.9; extra == "formats"
-Requires-Dist: pyyaml~=5.0; extra == "formats"
+Requires-Dist: pyyaml~=6.0; extra == "formats"
 Requires-Dist: cbor2~=5.6; extra == "formats"
 Requires-Dist: cloudpickle~=3.0; extra == "formats"
 Provides-Extra: http
@@ -83,3 +90,11 @@ Requires-Dist: sqlean.py~=3.45; python_version < "3.13" and extra == "sqldrivers
 Requires-Dist: duckdb~=1.1; extra == "sqldrivers"
 Provides-Extra: testing
 Requires-Dist: pytest~=8.0; extra == "testing"
+Provides-Extra: plus
+Requires-Dist: anyio~=4.6; extra == "plus"
+Requires-Dist: sniffio~=1.3; extra == "plus"
+Requires-Dist: asttokens~=2.4; extra == "plus"
+Requires-Dist: executing~=2.1; extra == "plus"
+Requires-Dist: orjson~=3.10; extra == "plus"
+Requires-Dist: pyyaml~=6.0; extra == "plus"
+Requires-Dist: wrapt~=1.14; extra == "plus"

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev50'
-__revision__ = '2b2cef5bd15c042c17a10bf1caa60e70dbeeeb43'
+__version__ = '0.0.0.dev52'
+__revision__ = '5ab36e956ad89c19e714eca498e51f63ada8ab92'
 
 
 #
@@ -28,6 +28,8 @@ class Project(ProjectBase):
     name = 'omlish'
     description = 'omlish'
 
+    #
+
     optional_dependencies = {
         'async': [
             'anyio ~= 4.6',
@@ -61,7 +63,7 @@ class Project(ProjectBase):
 
             'json5 ~= 0.9',
 
-            'pyyaml ~= 5.0',
+            'pyyaml ~= 6.0',
 
             'cbor2 ~= 5.6',
 
@@ -109,6 +111,32 @@ class Project(ProjectBase):
         ],
     }
 
+    #
+
+    _plus_dependencies = [
+        'anyio',
+        'sniffio',
+
+        'asttokens',
+        'executing',
+
+        'orjson',
+        'pyyaml',
+
+        'wrapt',
+    ]
+
+    _dependency_specs_by_name = (lambda od: {  # noqa
+        s.split()[0]: s
+        for l in od.values() for s in l
+    })(optional_dependencies)
+
+    optional_dependencies['plus'] = (lambda ds, pd: [  # noqa
+        ds[n] for n in pd
+    ])(_dependency_specs_by_name, _plus_dependencies)
+
+    #
+
     entry_points = {
         'omlish.manifests': {name: name},
     }
@@ -134,6 +162,7 @@ class SetuptoolsBase:
             '*.c',
             '*.cc',
             '*.cu',
+            '*.g4',
             '*.h',
 
             '.manifests.json',

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish/bootstrap/sys.py

@@ -29,7 +29,7 @@ else:
     libc = lang.proxy_import('..libc', __package__)
     logs = lang.proxy_import('..logs', __package__)
     osu = lang.proxy_import('..os', __package__)
-    dotenv = lang.proxy_import('.formats.dotenv', __package__)
+    dotenv = lang.proxy_import('..formats.dotenv', __package__)
 
 
 ##

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish/dataclasses/impl/api.py

@@ -33,7 +33,7 @@ def field(  # noqa
         derive: ta.Callable[..., ta.Any] | None = None,
         coerce: bool | ta.Callable[[ta.Any], ta.Any] | None = None,
         validate: ta.Callable[[ta.Any], bool] | None = None,
-        check_type: bool | type | None = None,
+        check_type: bool | type | tuple[type | None, ...] | None = None,
         override: bool = False,
         repr_fn: ta.Callable[[ta.Any], str | None] | None = None,
         frozen: bool | None = None,

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish/dataclasses/impl/fields.py

@@ -193,7 +193,10 @@ def field_init(
 
     if fx.check_type:
         cn = f'__dataclass_check_type__{f.name}__'
-        if isinstance(fx.check_type, type):
+        ct: ta.Any
+        if isinstance(fx.check_type, tuple):
+            ct = tuple(type(None) if e is None else check_.isinstance(e, type) for e in fx.check_type)
+        elif isinstance(fx.check_type, (type, tuple)):
             ct = fx.check_type
         # FIXME:
         # elif info.params_extras.generic_init:

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish/dataclasses/impl/params.py

@@ -45,7 +45,7 @@ class FieldExtras(lang.Final):
     derive: ta.Callable[..., ta.Any] | None = None  # TODO
     coerce: bool | ta.Callable[[ta.Any], ta.Any] | None = None
     validate: ta.Callable[[ta.Any], bool] | None = None
-    check_type: bool | type | None = None
+    check_type: bool | type | tuple[type | None, ...] | None = None
     override: bool = False
     repr_fn: ta.Callable[[ta.Any], str | None] | None = None
     frozen: bool | None = None  # TODO

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish/dispatch/dispatch.py

@@ -25,12 +25,18 @@ def get_impl_func_cls_set(func: ta.Callable) -> frozenset[type]:
     if not ann:
         raise TypeError(f'Invalid impl func: {func!r}')
 
+    def erase(a):
+        if isinstance(a, rfl.Generic):
+            return a.cls
+        else:
+            return check.isinstance(a, type)
+
     _, cls = next(iter(ta.get_type_hints(func).items()))
     rty = rfl.type_(cls)
     if isinstance(rty, rfl.Union):
-        ret = frozenset(check.isinstance(arg, type) for arg in rty.args)
+        ret = frozenset(erase(arg) for arg in rty.args)
     else:
-        ret = frozenset([check.isinstance(rty, type)])
+        ret = frozenset([erase(rty)])
 
     _IMPL_FUNC_CLS_SET_CACHE[func] = ret
     return ret

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish/marshal/__init__.py

@@ -24,7 +24,8 @@ from .base import (  # noqa
     RecursiveMarshalerFactory,
     RecursiveUnmarshalerFactory,
 
-    SetType,
+    Override,
+    ReflectOverride,
 )
 
 from .exceptions import (  # noqa
@@ -44,6 +45,8 @@ from .naming import (  # noqa
 )
 
 from .global_ import (  # noqa
+    GLOBAL_REGISTRY,
+
     marshal,
     unmarshal,
 )

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish/marshal/base.py

@@ -81,11 +81,11 @@ https://github.com/yukinarit/pyserde
  - Flatten
 """
 import abc
-import dataclasses as dc
 import typing as ta
 
 from .. import check
 from .. import collections as col
+from .. import dataclasses as dc
 from .. import lang
 from .. import matchfns as mfs
 from .. import reflect as rfl
@@ -163,13 +163,18 @@ class BaseContext(lang.Abstract):
     registry: Registry
     options: col.TypeMap[Option] = col.TypeMap()
 
+    def _reflect(self, o: ta.Any) -> rfl.Type:
+        if (ovr := self.registry.get_of(o, ReflectOverride)):
+            return ovr[-1].rty
+        return rfl.type_(o)
+
 
 @dc.dataclass(frozen=True)
 class MarshalContext(BaseContext, lang.Final):
     factory: MarshalerFactory | None = None
 
     def make(self, o: ta.Any) -> Marshaler:
-        rty = rfl.type_(o)
+        rty = self._reflect(o)
         try:
             return check.not_none(self.factory)(self, rty)  # type: ignore
         except mfs.MatchGuardError:
@@ -181,7 +186,7 @@ class UnmarshalContext(BaseContext, lang.Final):
     factory: UnmarshalerFactory | None = None
 
     def make(self, o: ta.Any) -> Unmarshaler:
-        rty = rfl.type_(o)
+        rty = self._reflect(o)
         try:
             return check.not_none(self.factory)(self, rty)  # type: ignore
         except mfs.MatchGuardError:
@@ -214,10 +219,15 @@ class RecursiveUnmarshalerFactory(RecursiveTypeFactory[UnmarshalContext, Unmarsh
 ##
 
 
-@dc.dataclass(frozen=True)
-class SetType(RegistryItem, lang.Final):
-    marshaler: Marshaler | None = None
+@dc.dataclass(frozen=True, kw_only=True)
+class Override(RegistryItem, lang.Final):
+    marshaler: Marshaler | None = dc.xfield(None, check_type=(Marshaler, None))
     marshaler_factory: MarshalerFactory | None = None
 
-    unmarshaler: Unmarshaler | None = None
+    unmarshaler: Unmarshaler | None = dc.xfield(None, check_type=(Unmarshaler, None))
     unmarshaler_factory: UnmarshalerFactory | None = None
+
+
+@dc.dataclass(frozen=True)
+class ReflectOverride(RegistryItem, lang.Final):
+    rty: rfl.Type

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish/marshal/dataclasses.py

@@ -3,6 +3,7 @@ import typing as ta
 from .. import check
 from .. import collections as col
 from .. import dataclasses as dc
+from .. import lang
 from .. import reflect as rfl
 from .base import MarshalContext
 from .base import Marshaler
@@ -119,11 +120,12 @@ def _make_field_obj(ctx, ty, obj, fac):
 
 class DataclassMarshalerFactory(MarshalerFactory):
     def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
-        return isinstance(rty, type) and dc.is_dataclass(rty)
+        return isinstance(rty, type) and dc.is_dataclass(rty) and not lang.is_abstract_class(rty)
 
     def fn(self, ctx: MarshalContext, rty: rfl.Type) -> Marshaler:
         ty = check.isinstance(rty, type)
         check.state(dc.is_dataclass(ty))
+        check.state(not lang.is_abstract_class(ty))
 
         dc_md = get_dataclass_metadata(ty)
 
@@ -143,11 +145,12 @@ class DataclassMarshalerFactory(MarshalerFactory):
 
 class DataclassUnmarshalerFactory(UnmarshalerFactory):
     def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
-        return isinstance(rty, type) and dc.is_dataclass(rty)
+        return isinstance(rty, type) and dc.is_dataclass(rty) and not lang.is_abstract_class(rty)
 
     def fn(self, ctx: UnmarshalContext, rty: rfl.Type) -> Unmarshaler:
         ty = check.isinstance(rty, type)
         check.state(dc.is_dataclass(ty))
+        check.state(not lang.is_abstract_class(ty))
         dc_md = get_dataclass_metadata(ty)
 
         d: dict[str, tuple[FieldInfo, Unmarshaler]] = {}

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish/marshal/global_.py

@@ -17,7 +17,7 @@ T = ta.TypeVar('T')
 ##
 
 
-GLOBAL_REGISTRY = Registry()
+GLOBAL_REGISTRY: Registry = Registry()
 
 
 ##

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish/marshal/objects.py

@@ -45,10 +45,10 @@ class FieldMetadata:
 
     options: FieldOptions = DEFAULT_FIELD_OPTIONS
 
-    marshaler: Marshaler | None = None
+    marshaler: Marshaler | None = dc.xfield(None, check_type=(Marshaler, None))
     marshaler_factory: MarshalerFactory | None = None
 
-    unmarshaler: Unmarshaler | None = None
+    unmarshaler: Unmarshaler | None = dc.xfield(None, check_type=(Unmarshaler, None))
     unmarshaler_factory: UnmarshalerFactory | None = None
 
     def update(self, **kwargs: ta.Any) -> 'FieldMetadata':

omlish-0.0.0.dev52/omlish/marshal/registries.py

@@ -0,0 +1,86 @@
+"""
+TODO:
+ - inheritance
+"""
+import dataclasses as dc
+import threading
+import typing as ta
+
+from .. import collections as col
+from .. import lang
+
+
+class RegistryItem(lang.Abstract):
+    pass
+
+
+RegistryItemT = ta.TypeVar('RegistryItemT', bound=RegistryItem)
+
+
+@dc.dataclass(frozen=True)
+class _KeyRegistryItems:
+    key: ta.Any
+    items: list[RegistryItem] = dc.field(default_factory=list)
+    item_lists_by_ty: dict[type[RegistryItem], list[RegistryItem]] = dc.field(default_factory=dict)
+
+    def add(self, *items: RegistryItem) -> None:
+        for i in items:
+            self.items.append(i)
+            self.item_lists_by_ty.setdefault(type(i), []).append(i)
+
+
+class Registry:
+    def __init__(self) -> None:
+        super().__init__()
+        self._mtx = threading.Lock()
+        self._idct: ta.MutableMapping[ta.Any, _KeyRegistryItems] = col.IdentityKeyDict()
+        self._dct: dict[ta.Any, _KeyRegistryItems] = {}
+
+    def register(
+            self,
+            key: ta.Any,
+            *items: RegistryItem,
+            identity: bool = False,
+    ) -> 'Registry':
+        with self._mtx:
+            dct: ta.Any = self._idct if identity else self._dct
+            if (sr := dct.get(key)) is None:
+                sr = dct[key] = _KeyRegistryItems(key)
+            sr.add(*items)
+        return self
+
+    def get(
+            self,
+            key: ta.Any,
+            *,
+            identity: bool | None = None,
+    ) -> ta.Sequence[RegistryItem]:
+        if identity is None:
+            return (
+                *self.get(key, identity=True),
+                *self.get(key, identity=False),
+            )
+        dct: ta.Any = self._idct if identity else self._dct
+        try:
+            return dct[key].items
+        except KeyError:
+            return ()
+
+    def get_of(
+            self,
+            key: ta.Any,
+            item_ty: type[RegistryItemT],
+            *,
+            identity: bool | None = None,
+    ) -> ta.Sequence[RegistryItemT]:
+        if identity is None:
+            return (
+                *self.get_of(key, item_ty, identity=True),
+                *self.get_of(key, item_ty, identity=False),
+            )
+        dct: ta.Any = self._idct if identity else self._dct
+        try:
+            sr = dct[key]
+        except KeyError:
+            return ()
+        return sr.item_lists_by_ty.get(item_ty, ())

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish/secrets/__init__.py

@@ -7,6 +7,7 @@ from .secrets import (  # noqa
     FnSecrets,
     LoggingSecrets,
     MappingSecrets,
+    Secret,
     SecretRef,
     SecretRefOrStr,
     Secrets,

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish/secrets/secrets.py

@@ -99,6 +99,12 @@ class Secrets(lang.Abstract):
         else:
             return Secret(key=key, value=raw)
 
+    def try_get(self, key: str) -> Secret | None:
+        try:
+            return self.get(key)
+        except KeyError:
+            return None
+
     @abc.abstractmethod
     def _get_raw(self, key: str) -> str:
         raise NotImplementedError
@@ -119,15 +125,36 @@ EMPTY_SECRETS = EmptySecrets()
 
 
 class MappingSecrets(Secrets):
-    def __init__(self, dct: ta.Mapping[str, str]) -> None:
+    def __init__(
+            self,
+            dct: ta.Mapping[str, str | Secret],
+            no_copy: bool = False,
+    ) -> None:
         super().__init__()
+
+        if not no_copy:
+            dct = {
+                k: v if isinstance(v, Secret) else Secret(key=k, value=v)
+                for k, v in dct.items()
+            }
+
         self._dct = dct
 
     def __repr__(self) -> str:
         return f'{self.__class__.__name__}({{{", ".join(map(repr, self._dct.keys()))}}})'
 
     def _get_raw(self, key: str) -> str:
-        return self._dct[key]
+        try:
+            e = self._dct[key]
+        except KeyError:  # noqa
+            raise
+        else:
+            if isinstance(e, Secret):
+                return e.reveal()
+            elif isinstance(e, str):
+                return e
+            else:
+                raise TypeError(e)
 
 
 ##
@@ -167,7 +194,7 @@ class CachingSecrets(Secrets):
     ) -> None:
         super().__init__()
         self._child = child
-        self._dct: dict[str, str] = {}
+        self._dct: dict[str, Secret] = {}
         self._ttl_s = ttl_s
         self._clock = clock
         self._deque: collections.deque[tuple[str, float]] = collections.deque()
@@ -187,15 +214,17 @@ class CachingSecrets(Secrets):
     def _get_raw(self, key: str) -> str:
         self.evict()
         try:
-            return self._dct[key]
+            e = self._dct[key]
         except KeyError:
             pass
-        out = self._child._get_raw(key)  # noqa
+        else:
+            return e.reveal()
+        out = self._child.get(key)  # noqa
         self._dct[key] = out
         if self._ttl_s is not None:
             dl = self._clock() + self._ttl_s
             self._deque.append((key, dl))
-        return out
+        return out.reveal()
 
 
 ##

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish/testing/pytest/inject/harness.py

@@ -172,21 +172,17 @@ def register(*args: inj.Element | inj.Elements) -> None:
     _HARNESS_ELEMENTS_LIST.append(inj.as_elements(*args))
 
 
-TypeT = ta.TypeVar('TypeT', bound=type)
-
-
 def bind(
         scope: PytestScope | str = PytestScope.SESSION,
         *,
         eager: bool = False,  # FIXME
-) -> ta.Callable[[TypeT], TypeT]:
-    def inner(cls):
+) -> ta.Callable[[T], T]:
+    def inner(obj):
         pts = scope if isinstance(scope, PytestScope) else PytestScope[check.isinstance(scope, str).upper()]
-        check.isinstance(cls, type)
         register(inj.as_elements(
-            inj.bind(cls, in_=_SCOPES_BY_PYTEST_SCOPE[pts]),
+            inj.bind(obj, in_=_SCOPES_BY_PYTEST_SCOPE[pts]),
         ))
-        return cls
+        return obj
     return inner
 
 

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev50
+Version: 0.0.0.dev52
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -27,7 +27,7 @@ Requires-Dist: psutil~=6.0; extra == "all"
 Requires-Dist: orjson~=3.10; extra == "all"
 Requires-Dist: ujson~=5.10; extra == "all"
 Requires-Dist: json5~=0.9; extra == "all"
-Requires-Dist: pyyaml~=5.0; extra == "all"
+Requires-Dist: pyyaml~=6.0; extra == "all"
 Requires-Dist: cbor2~=5.6; extra == "all"
 Requires-Dist: cloudpickle~=3.0; extra == "all"
 Requires-Dist: httpx[http2]~=0.27; extra == "all"
@@ -43,6 +43,13 @@ Requires-Dist: apsw~=3.46; extra == "all"
 Requires-Dist: sqlean.py~=3.45; python_version < "3.13" and extra == "all"
 Requires-Dist: duckdb~=1.1; extra == "all"
 Requires-Dist: pytest~=8.0; extra == "all"
+Requires-Dist: anyio~=4.6; extra == "all"
+Requires-Dist: sniffio~=1.3; extra == "all"
+Requires-Dist: asttokens~=2.4; extra == "all"
+Requires-Dist: executing~=2.1; extra == "all"
+Requires-Dist: orjson~=3.10; extra == "all"
+Requires-Dist: pyyaml~=6.0; extra == "all"
+Requires-Dist: wrapt~=1.14; extra == "all"
 Provides-Extra: async
 Requires-Dist: anyio~=4.6; extra == "async"
 Requires-Dist: sniffio~=1.3; extra == "async"
@@ -61,7 +68,7 @@ Provides-Extra: formats
 Requires-Dist: orjson~=3.10; extra == "formats"
 Requires-Dist: ujson~=5.10; extra == "formats"
 Requires-Dist: json5~=0.9; extra == "formats"
-Requires-Dist: pyyaml~=5.0; extra == "formats"
+Requires-Dist: pyyaml~=6.0; extra == "formats"
 Requires-Dist: cbor2~=5.6; extra == "formats"
 Requires-Dist: cloudpickle~=3.0; extra == "formats"
 Provides-Extra: http
@@ -83,3 +90,11 @@ Requires-Dist: sqlean.py~=3.45; python_version < "3.13" and extra == "sqldrivers
 Requires-Dist: duckdb~=1.1; extra == "sqldrivers"
 Provides-Extra: testing
 Requires-Dist: pytest~=8.0; extra == "testing"
+Provides-Extra: plus
+Requires-Dist: anyio~=4.6; extra == "plus"
+Requires-Dist: sniffio~=1.3; extra == "plus"
+Requires-Dist: asttokens~=2.4; extra == "plus"
+Requires-Dist: executing~=2.1; extra == "plus"
+Requires-Dist: orjson~=3.10; extra == "plus"
+Requires-Dist: pyyaml~=6.0; extra == "plus"
+Requires-Dist: wrapt~=1.14; extra == "plus"

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/omlish.egg-info/requires.txt

@@ -13,7 +13,7 @@ psutil~=6.0
 orjson~=3.10
 ujson~=5.10
 json5~=0.9
-pyyaml~=5.0
+pyyaml~=6.0
 cbor2~=5.6
 cloudpickle~=3.0
 httpx[http2]~=0.27
@@ -56,7 +56,7 @@ psutil~=6.0
 orjson~=3.10
 ujson~=5.10
 json5~=0.9
-pyyaml~=5.0
+pyyaml~=6.0
 cbor2~=5.6
 cloudpickle~=3.0
 
@@ -66,6 +66,15 @@ httpx[http2]~=0.27
 [misc]
 wrapt~=1.14
 
+[plus]
+anyio~=4.6
+sniffio~=1.3
+asttokens~=2.4
+executing~=2.1
+orjson~=3.10
+pyyaml~=6.0
+wrapt~=1.14
+
 [secrets]
 cryptography~=43.0
 

{omlish-0.0.0.dev50 → omlish-0.0.0.dev52}/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.dev50'
+version = '0.0.0.dev52'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -38,7 +38,7 @@ all = [
     'orjson ~= 3.10',
     'ujson ~= 5.10',
     'json5 ~= 0.9',
-    'pyyaml ~= 5.0',
+    'pyyaml ~= 6.0',
     'cbor2 ~= 5.6',
     'cloudpickle ~= 3.0',
     'httpx[http2] ~= 0.27',
@@ -54,6 +54,13 @@ all = [
     'sqlean.py ~= 3.45; python_version < "3.13"',
     'duckdb ~= 1.1',
     'pytest ~= 8.0',
+    'anyio ~= 4.6',
+    'sniffio ~= 1.3',
+    'asttokens ~= 2.4',
+    'executing ~= 2.1',
+    'orjson ~= 3.10',
+    'pyyaml ~= 6.0',
+    'wrapt ~= 1.14',
 ]
 async = [
     'anyio ~= 4.6',
@@ -76,7 +83,7 @@ formats = [
     'orjson ~= 3.10',
     'ujson ~= 5.10',
     'json5 ~= 0.9',
-    'pyyaml ~= 5.0',
+    'pyyaml ~= 6.0',
     'cbor2 ~= 5.6',
     'cloudpickle ~= 3.0',
 ]
@@ -105,6 +112,15 @@ sqldrivers = [
 testing = [
     'pytest ~= 8.0',
 ]
+plus = [
+    'anyio ~= 4.6',
+    'sniffio ~= 1.3',
+    'asttokens ~= 2.4',
+    'executing ~= 2.1',
+    'orjson ~= 3.10',
+    'pyyaml ~= 6.0',
+    'wrapt ~= 1.14',
+]
 
 [project.entry-points]
 'omlish.manifests' = {omlish = 'omlish'}
@@ -126,6 +142,7 @@ exclude = [
     '*.c',
     '*.cc',
     '*.cu',
+    '*.g4',
     '*.h',
     '.manifests.json',
     'LICENSE',