omlish 0.0.0.dev10__tar.gz → 0.0.0.dev11__tar.gz

{omlish-0.0.0.dev10/omlish.egg-info → omlish-0.0.0.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev10
+Version: 0.0.0.dev11
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

omlish-0.0.0.dev11/README.rst

@@ -0,0 +1,5 @@
+*omlish*
+
+Packages installable from git via:
+::
+  pip install 'git+https://github.com/wrmsr/omlish@master#subdirectory=.pkg/<pkg>'

{omlish-0.0.0.dev10 → omlish-0.0.0.dev11}/omlish/__about__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.0.dev10'
+__version__ = '0.0.0.dev11'
 
 
 #
@@ -77,7 +77,7 @@ class Project(ProjectBase):
         ],
 
         'sqlx': [
-            "sqlean.py >= 3.45; python_version < '3.13'",
+            'sqlean.py >= 3.45; python_version < "3.13"',
 
             'duckdb >= 1',
         ],

{omlish-0.0.0.dev10 → omlish-0.0.0.dev11}/omlish/dispatch/methods.py

@@ -10,6 +10,7 @@ import typing as ta
 import weakref
 
 from .. import check
+from .. import lang
 from .dispatch import Dispatcher
 from .dispatch import get_impl_func_cls_set
 
@@ -17,20 +18,6 @@ from .dispatch import get_impl_func_cls_set
 T = ta.TypeVar('T')
 
 
-def build_mro_dct(instance_cls: type, owner_cls: type | None = None) -> ta.Mapping[str, ta.Any]:
-    if owner_cls is None:
-        owner_cls = instance_cls
-    mro = instance_cls.__mro__[-2::-1]
-    try:
-        pos = mro.index(owner_cls)
-    except ValueError:
-        raise TypeError(f'Owner class {owner_cls} not in mro of instance class {instance_cls}') from None
-    dct: dict[str, ta.Any] = {}
-    for cur_cls in mro[:pos + 1]:
-        dct.update(cur_cls.__dict__)
-    return dct
-
-
 class Method:
     def __init__(self, func: ta.Callable) -> None:
         if not callable(func) and not hasattr(func, '__get__'):  # type: ignore
@@ -91,7 +78,7 @@ class Method:
     def build_attr_dispatcher(self, instance_cls: type, owner_cls: type | None = None) -> Dispatcher[str]:
         disp: Dispatcher[str] = Dispatcher()
 
-        mro_dct = build_mro_dct(instance_cls, owner_cls)
+        mro_dct = lang.build_mro_dict(instance_cls, owner_cls)
         seen: ta.Mapping[ta.Any, str] = {}
         for nam, att in mro_dct.items():
             if att in self._impls:

{omlish-0.0.0.dev10 → omlish-0.0.0.dev11}/omlish/lang/__init__.py

@@ -146,6 +146,7 @@ from .objects import (  # noqa
     SimpleProxy,
     arg_repr,
     attr_repr,
+    build_mro_dict,
     can_weakref,
     deep_subclasses,
     new_type,

{omlish-0.0.0.dev10 → omlish-0.0.0.dev11}/omlish/lang/objects.py

@@ -97,6 +97,31 @@ def deep_subclasses(cls: type) -> ta.Iterator[type]:
         todo.extend(reversed(cur.__subclasses__()))
 
 
+def build_mro_dict(
+        instance_cls: type,
+        owner_cls: type | None = None,
+        *,
+        bottom_up_key_order: bool = False,
+) -> ta.Mapping[str, ta.Any]:
+    if owner_cls is None:
+        owner_cls = instance_cls
+    mro = instance_cls.__mro__[-2::-1]
+    try:
+        pos = mro.index(owner_cls)
+    except ValueError:
+        raise TypeError(f'Owner class {owner_cls} not in mro of instance class {instance_cls}') from None
+    dct: dict[str, ta.Any] = {}
+    if not bottom_up_key_order:
+        for cur_cls in mro[:pos + 1][::-1]:
+            for k, v in cur_cls.__dict__.items():
+                if k not in dct:
+                    dct[k] = v
+    else:
+        for cur_cls in mro[:pos + 1]:
+            dct.update(cur_cls.__dict__)
+    return dct
+
+
 ##
 
 

{omlish-0.0.0.dev10 → omlish-0.0.0.dev11}/omlish/matchfns.py

@@ -1,3 +1,9 @@
+"""
+TODO:
+ - unify MatchFnClass with dispatch.method?
+  - __call__ = mfs.method(); @__call__.register(lambda: ...) def _call_... ?
+  - not really the same thing, dispatch is unordered this is necessarily ordered
+"""
 import abc
 import dataclasses as dc
 import typing as ta
@@ -117,7 +123,7 @@ class MultiMatchFn(MatchFn[P, T]):
         )
 
 
-def multi(*children: MatchFn[P, T], strict: bool = False):
+def multi(*children: MatchFn[P, T], strict: bool = False) -> MultiMatchFn:  # MultiMatchFn[P[0], T[-1]]
     return MultiMatchFn(children, strict=strict)  # noqa
 
 
@@ -200,7 +206,7 @@ class MatchFnClass(MatchFn[P, T]):
             mf = self.__match_fn = self._cls_match_fn.__get__(self)
         return mf
 
-    def __init_subclass__(cls, strict: bool = False, **kwargs):
+    def __init_subclass__(cls, strict: bool = False, **kwargs: ta.Any) -> None:
         super().__init_subclass__()
         if '_cls_match_fn' in cls.__dict__:
             raise AttributeError('_cls_match_fn')

{omlish-0.0.0.dev10 → omlish-0.0.0.dev11}/omlish/testing/__init__.py

@@ -1,4 +1,5 @@
 from .testing import (  # noqa
+    assert_dicts_equal_ordered,
     call_many_with_timeout,
     can_import,
     run_with_timeout,

{omlish-0.0.0.dev10 → omlish-0.0.0.dev11}/omlish/testing/pytest/inject/harness.py

@@ -120,29 +120,44 @@ class Harness:
 
 @plugins.register
 class HarnessPlugin:
+    def __init__(self) -> None:
+        super().__init__()
+        self._harnesses_by_session: dict[ta.Any, Harness] = {}
+
+    def get_session_harness(self, session: ta.Any) -> Harness:
+        return self._harnesses_by_session[session]
 
     @pytest.fixture(scope='session', autouse=True)
-    def _harness_scope_listener_session(self, harness, request):
-        with harness._pytest_scope_manager(PytestScope.SESSION, request):  # noqa
-            yield
+    def _harness_scope_listener_session(self, request):
+        with Harness(inj.as_elements(*_HARNESS_ELEMENTS_LIST)).activate() as harness:
+            self._harnesses_by_session[request.session] = harness
+            try:
+                with harness._pytest_scope_manager(PytestScope.SESSION, request):  # noqa
+                    yield
+            finally:
+                del self._harnesses_by_session[request.session]
 
     @pytest.fixture(scope='package', autouse=True)
-    def _harness_scope_listener_package(self, harness, request):
+    def _harness_scope_listener_package(self, request):
+        harness = self.get_session_harness(request.session)
         with harness._pytest_scope_manager(PytestScope.PACKAGE, request):  # noqa
             yield
 
     @pytest.fixture(scope='module', autouse=True)
-    def _harness_scope_listener_module(self, harness, request):
+    def _harness_scope_listener_module(self, request):
+        harness = self.get_session_harness(request.session)
         with harness._pytest_scope_manager(PytestScope.MODULE, request):  # noqa
             yield
 
     @pytest.fixture(scope='class', autouse=True)
-    def _harness_scope_listener_class(self, harness, request):
+    def _harness_scope_listener_class(self, request):
+        harness = self.get_session_harness(request.session)
         with harness._pytest_scope_manager(PytestScope.CLASS, request):  # noqa
             yield
 
     @pytest.fixture(scope='function', autouse=True)  # noqa
-    def _harness_scope_listener_function(self, harness, request):
+    def _harness_scope_listener_function(self, request):
+        harness = self.get_session_harness(request.session)
         with harness._pytest_scope_manager(PytestScope.FUNCTION, request):  # noqa
             yield
 
@@ -163,7 +178,7 @@ TypeT = ta.TypeVar('TypeT', bound=type)
 def bind(
         scope: PytestScope | str = PytestScope.SESSION,
         *,
-        eager: bool = False,
+        eager: bool = False,  # FIXME
 ) -> ta.Callable[[TypeT], TypeT]:
     def inner(cls):
         pts = scope if isinstance(scope, PytestScope) else PytestScope[check.isinstance(scope, str).upper()]
@@ -175,7 +190,8 @@ def bind(
     return inner
 
 
-@pytest.fixture(scope='session', autouse=True)
-def harness() -> ta.Generator[Harness, None, None]:
-    with Harness(inj.as_elements(*_HARNESS_ELEMENTS_LIST)).activate() as h:
-        yield h
+@pytest.fixture
+def harness(request) -> Harness:
+    pm = request.session.config.pluginmanager
+    hp = check.single(p for n, p in pm.list_name_plugin() if isinstance(p, HarnessPlugin))
+    return hp.get_session_harness(request.session)

{omlish-0.0.0.dev10 → omlish-0.0.0.dev11}/omlish/testing/pytest/plugins/asyncs.py

@@ -39,7 +39,9 @@ https://github.com/agronholm/anyio/blob/8907964926a24461840eee0925d3f355e729f15d
 """  # noqa
 import functools
 import inspect
+import sys
 import typing as ta
+import warnings
 
 import pytest
 
@@ -80,6 +82,20 @@ class AsyncsPlugin:
         *[s for s in KNOWN_BACKENDS if lang.can_import(s)],
     ]
 
+    def pytest_cmdline_main(self, config):
+        if (aio_plugin := sys.modules.get('pytest_asyncio.plugin')):
+            # warnings.filterwarnings is clobbered by pytest using warnings.catch_warnings
+            def aio_plugin_warn(message, *args, **kwargs):
+                if (
+                        isinstance(message, pytest.PytestDeprecationWarning) and
+                        message.args[0].startswith('The configuration option "asyncio_default_fixture_loop_scope" is unset.')  # noqa
+                ):
+                    return
+                warnings.warn(message, *args, **kwargs)
+
+            aio_plugin.warnings = lang.proxy_import('warnings')  # type: ignore
+            aio_plugin.warnings.warn = aio_plugin_warn  # type: ignore
+
     def pytest_configure(self, config):
         config.addinivalue_line('markers', f'{ASYNCS_MARK}: marks for all async backends')
         config.addinivalue_line('markers', 'trio_asyncio: marks for trio_asyncio backend')

{omlish-0.0.0.dev10 → omlish-0.0.0.dev11}/omlish/testing/testing.py

@@ -11,6 +11,12 @@ import typing as ta
 DEFAULT_TIMEOUT_S = 30
 
 T = ta.TypeVar('T')
+K = ta.TypeVar('K')
+V = ta.TypeVar('V')
+
+
+def assert_dicts_equal_ordered(l: ta.Mapping[K, V], r: ta.Mapping[K, V]) -> None:
+    assert list(l.items()) == list(r.items())
 
 
 def call_many_with_timeout(

{omlish-0.0.0.dev10 → omlish-0.0.0.dev11/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev10
+Version: 0.0.0.dev11
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev10 → omlish-0.0.0.dev11}/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.dev10'
+version = '0.0.0.dev11'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -47,7 +47,7 @@ all = [
     'aiomysql >= 0.2',
     'aiosqlite >= 0.20',
     'asyncpg >= 0.29; python_version < "3.13"',
-    "sqlean.py >= 3.45; python_version < '3.13'",
+    'sqlean.py >= 3.45; python_version < "3.13"',
     'duckdb >= 1',
     'pytest >= 8',
 ]
@@ -89,7 +89,7 @@ sql = [
     'asyncpg >= 0.29; python_version < "3.13"',
 ]
 sqlx = [
-    "sqlean.py >= 3.45; python_version < '3.13'",
+    'sqlean.py >= 3.45; python_version < "3.13"',
     'duckdb >= 1',
 ]
 testing = [

omlish-0.0.0.dev10/README.rst

@@ -1 +0,0 @@
-*omlish*