omlish 0.0.0.dev325__tar.gz → 0.0.0.dev327__tar.gz

{omlish-0.0.0.dev325/omlish.egg-info → omlish-0.0.0.dev327}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev325
+Version: 0.0.0.dev327
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -39,7 +39,7 @@ Requires-Dist: pymysql~=1.1; extra == "all"
 Requires-Dist: aiomysql~=0.2; extra == "all"
 Requires-Dist: aiosqlite~=0.21; extra == "all"
 Requires-Dist: asyncpg~=0.30; extra == "all"
-Requires-Dist: apsw~=3.49; extra == "all"
+Requires-Dist: apsw~=3.50; extra == "all"
 Requires-Dist: sqlean.py~=3.49; extra == "all"
 Requires-Dist: duckdb~=1.3; extra == "all"
 Requires-Dist: markupsafe~=3.0; extra == "all"
@@ -87,7 +87,7 @@ Requires-Dist: pymysql~=1.1; extra == "sqldrivers"
 Requires-Dist: aiomysql~=0.2; extra == "sqldrivers"
 Requires-Dist: aiosqlite~=0.21; extra == "sqldrivers"
 Requires-Dist: asyncpg~=0.30; extra == "sqldrivers"
-Requires-Dist: apsw~=3.49; extra == "sqldrivers"
+Requires-Dist: apsw~=3.50; extra == "sqldrivers"
 Requires-Dist: sqlean.py~=3.49; extra == "sqldrivers"
 Requires-Dist: duckdb~=1.3; extra == "sqldrivers"
 Provides-Extra: templates

{omlish-0.0.0.dev325 → omlish-0.0.0.dev327}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev325'
-__revision__ = 'd3d23171448ce4b4fac00e71f7a1c242db8228f9'
+__version__ = '0.0.0.dev327'
+__revision__ = 'ce58b88c3e3c1e9bd7b09f89667cb4047b61684c'
 
 
 #
@@ -99,7 +99,7 @@ class Project(ProjectBase):
             'aiosqlite ~= 0.21',
             'asyncpg ~= 0.30',
 
-            'apsw ~= 3.49',
+            'apsw ~= 3.50',
 
             'sqlean.py ~= 3.49',
 

{omlish-0.0.0.dev325 → omlish-0.0.0.dev327}/omlish/docker/all.py

@@ -13,6 +13,10 @@ from .compose import (  # noqa
     get_compose_port,
 )
 
+from .consts import (  # noqa
+    DOCKER_FOR_MAC_HOSTNAME,
+)
+
 from .detect import (  # noqa
     DOCKER_HOST_PLATFORM_KEY,
     get_docker_host_platform,

{omlish-0.0.0.dev325 → omlish-0.0.0.dev327}/omlish/lang/__init__.py

@@ -327,10 +327,17 @@ from .sys import (  # noqa
 
 from .typing import (  # noqa
     BytesLike,
-    SequenceNotStr,
+
+    static_check_isinstance,
+    static_check_issubclass,
+    copy_type,
+
     protocol_check,
+
     typed_lambda,
     typed_partial,
+
+    SequenceNotStr,
 )
 
 ##

{omlish-0.0.0.dev325 → omlish-0.0.0.dev327}/omlish/lang/typing.py

@@ -16,12 +16,38 @@ T = ta.TypeVar('T')
 T_co = ta.TypeVar('T_co', covariant=True)
 T_contra = ta.TypeVar('T_contra', contravariant=True)
 
+# FIXME: remove? ducktyped by mypy (with memoryview)
 BytesLike: ta.TypeAlias = bytes | bytearray
 
 
 ##
 
 
+class static_check_isinstance(ta.Generic[T]):  # noqa
+    def __init__(self, *o: T) -> None:
+        pass
+
+    def __call__(self, o: T) -> T:
+        return o
+
+
+class static_check_issubclass(ta.Generic[T]):  # noqa
+    def __init__(self, *t: type[T]) -> None:
+        pass
+
+    def __call__(self, t: type[T]) -> type[T]:
+        return t
+
+
+def copy_type(o: T) -> ta.Callable[[ta.Any], T]:
+    """https://github.com/python/typing/issues/769#issuecomment-903760354"""
+
+    return lambda x: x
+
+
+##
+
+
 def protocol_check(proto: type) -> ta.Callable[[Ty], Ty]:
     def inner(cls):
         if not issubclass(cls, proto):

omlish-0.0.0.dev327/omlish/testing/pytest/plugins/switches.py

@@ -0,0 +1,236 @@
+"""
+TODO:
+ - inheritance
+ - dynamic registration
+ - dynamic switching (skip docker if not running, skip online if not online, ...)
+"""
+import dataclasses as dc
+import enum
+import typing as ta
+
+import pytest
+
+from .... import check
+from .... import collections as col
+from ....docker import all as docker
+from ._registry import register
+
+
+Configable: ta.TypeAlias = pytest.FixtureRequest | pytest.Config
+
+
+##
+
+
+class SwitchState(enum.Enum):
+    ENABLED = enum.auto()
+    DISABLED = enum.auto()
+    ONLY = enum.auto()
+    IF_SINGLE = enum.auto()
+
+
+@dc.dataclass(frozen=True, eq=False)
+class Switch:
+    name: str
+    _default_state: SwitchState | ta.Callable[[pytest.Session], SwitchState]
+
+    _: dc.KW_ONLY
+
+    add_marks: ta.Sequence[ta.Any] | None = None
+
+    def default_state(self, session: pytest.Session) -> SwitchState:
+        if isinstance(e := self._default_state, SwitchState):
+            return e
+        elif callable(e):
+            return check.isinstance(e(session), SwitchState)
+        else:
+            raise TypeError(e)
+
+    @property
+    def attr(self) -> str:
+        return self.name.replace('-', '_')
+
+
+SWITCHES: ta.Sequence[Switch] = [
+    Switch(
+        'name',
+        lambda _: SwitchState.ENABLED if docker.has_cli() else SwitchState.DISABLED,
+    ),
+
+    Switch(
+        'docker-guest',
+        lambda _: SwitchState.ENABLED if docker.is_likely_in_docker() else SwitchState.DISABLED,
+    ),
+
+    Switch(
+        'online',
+        SwitchState.ENABLED,
+    ),
+
+    Switch(
+        'integration',
+        SwitchState.ENABLED,
+    ),
+
+    Switch(
+        'high-mem',
+        SwitchState.ENABLED,
+        add_marks=[
+            # https://pytest-xdist.readthedocs.io/en/latest/distribution.html
+            pytest.mark.xdist_group('high-mem'),
+            pytest.mark.gc_collect_after(),
+        ],
+    ),
+
+    Switch(
+        'slow',
+        SwitchState.IF_SINGLE,
+    ),
+]
+
+
+SWITCHES_BY_NAME: ta.Mapping[str, Switch] = col.make_map_by(lambda sw: sw.name, SWITCHES, strict=True)
+SWITCHES_BY_ATTR: ta.Mapping[str, Switch] = col.make_map_by(lambda sw: sw.attr, SWITCHES, strict=True)
+
+
+##
+
+
+SWITCH_STATE_OPT_PREFIXES: ta.Mapping[SwitchState, str] = {
+    SwitchState.ENABLED: '--',
+    SwitchState.DISABLED: '--no-',
+    SwitchState.ONLY: '--only-',
+}
+
+
+def _get_obj_config(obj: Configable) -> pytest.Config:
+    if isinstance(obj, pytest.Config):
+        return obj
+    elif isinstance(obj, pytest.FixtureRequest):
+        return obj.config
+    else:
+        raise TypeError(obj)
+
+
+def is_disabled(obj: Configable | None, name: str) -> bool:
+    check.isinstance(name, str)
+    check.in_(name, SWITCHES_BY_NAME)
+    return obj is not None and _get_obj_config(obj).getoption(f'--no-{name}')
+
+
+def skip_if_disabled(obj: Configable | None, name: str) -> None:
+    if is_disabled(obj, name):
+        pytest.skip(f'{name} disabled')
+
+
+def get_specified_switches(obj: Configable) -> dict[Switch, SwitchState]:
+    ret: dict[Switch, SwitchState] = {}
+    for sw in SWITCHES:
+        sts = {
+            st
+            for st, pfx in SWITCH_STATE_OPT_PREFIXES.items()
+            if _get_obj_config(obj).getoption(pfx + sw.name)
+        }
+        if sts:
+            if len(sts) > 1:
+                raise Exception(f'Multiple switches specified for {sw.name}')
+            ret[sw] = check.single(sts)
+    return ret
+
+
+@dc.dataclass(frozen=True)
+class ItemSwitches:
+    switches: frozenset[Switch]
+    not_switches: frozenset[Switch]
+
+
+def get_item_switches(item: pytest.Item) -> ItemSwitches:
+    return ItemSwitches(
+        frozenset(sw for sw in SWITCHES if sw.attr in item.keywords),
+        frozenset(sw for sw in SWITCHES if ('not_' + sw.attr) in item.keywords),
+    )
+
+
+@register
+class SwitchesPlugin:
+    def pytest_addoption(self, parser):
+        for sw in SWITCHES:
+            parser.addoption(f'--no-{sw.name}', action='store_true', default=False, help=f'disable {sw.name} tests')
+            parser.addoption(f'--{sw.name}', action='store_true', default=False, help=f'enables {sw.name} tests')
+            parser.addoption(f'--only-{sw.name}', action='store_true', default=False, help=f'enables only {sw.name} tests')  # noqa
+
+    def pytest_configure(self, config):
+        for sw in SWITCHES:
+            config.addinivalue_line('markers', f'{sw.attr}: mark test as {sw.attr}')
+            config.addinivalue_line('markers', f'not_{sw.attr}: mark test as not {sw.attr}')
+
+    class _States:
+        def __init__(self, session: pytest.Session) -> None:
+            super().__init__()
+
+            self.session = session
+
+            self.default_states_by_switch: dict[Switch, SwitchState] = {
+                sw: sw.default_state(session)
+                for sw in SWITCHES
+            }
+
+            self.states_by_switch: dict[Switch, SwitchState] = {
+                **self.default_states_by_switch,
+                **get_specified_switches(session.config),
+            }
+
+            self.switch_sets_by_state: dict[SwitchState, frozenset[Switch]] = {
+                st: frozenset(sws)
+                for st, sws in col.multi_map(
+                    (st, sw)
+                    for sw, st in self.states_by_switch.items()
+                ).items()
+            }
+
+    _states_key: ta.ClassVar[pytest.StashKey[_States]] = pytest.StashKey[_States]()
+
+    def pytest_sessionstart(self, session):
+        session.stash[self._states_key] = self._States(session)
+
+    def pytest_collection_modifyitems(self, config, items):
+        def process_item(item):
+            state: SwitchesPlugin._States = item.session.stash[self._states_key]
+
+            item_switches = get_item_switches(item)
+
+            for sw in item_switches.switches:
+                for mk in sw.add_marks or []:
+                    item.add_marker(mk)
+
+            if (only_switches := state.switch_sets_by_state.get(SwitchState.ONLY)) is not None:
+                if not any(sw in only_switches for sw in item_switches.switches):
+                    item.add_marker(pytest.mark.skip(
+                        reason=f'skipping switches ({tuple(sw.name for sw in item_switches.switches)!r} (only)',
+                    ))
+                    return
+
+            disabled_switches = state.switch_sets_by_state.get(SwitchState.DISABLED, frozenset())
+            for sw in item_switches.switches:
+                if sw in disabled_switches:
+                    item.add_marker(pytest.mark.skip(reason=f'skipping switch {sw.name!r} (disabled)'))
+
+            enabled_switches = state.switch_sets_by_state.get(SwitchState.ENABLED, frozenset())
+            for sw in item_switches.not_switches:
+                if sw in enabled_switches:
+                    item.add_marker(pytest.mark.skip(reason=f'skipping switch {sw.name!r} (not-enabled)'))
+
+        for item in items:
+            process_item(item)
+
+    def pytest_collection_finish(self, session):
+        state: SwitchesPlugin._States = session.stash[self._states_key]
+
+        if_single_switches = state.switch_sets_by_state.get(SwitchState.IF_SINGLE, frozenset())
+
+        if len(session.items) > 1:
+            for item in session.items:
+                item_switches = get_item_switches(item)
+                for sw in item_switches.switches:
+                    if sw in if_single_switches:
+                        item.add_marker(pytest.mark.skip(reason=f'skipping switch {sw.name!r} (not-single)'))

{omlish-0.0.0.dev325 → omlish-0.0.0.dev327/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev325
+Version: 0.0.0.dev327
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -39,7 +39,7 @@ Requires-Dist: pymysql~=1.1; extra == "all"
 Requires-Dist: aiomysql~=0.2; extra == "all"
 Requires-Dist: aiosqlite~=0.21; extra == "all"
 Requires-Dist: asyncpg~=0.30; extra == "all"
-Requires-Dist: apsw~=3.49; extra == "all"
+Requires-Dist: apsw~=3.50; extra == "all"
 Requires-Dist: sqlean.py~=3.49; extra == "all"
 Requires-Dist: duckdb~=1.3; extra == "all"
 Requires-Dist: markupsafe~=3.0; extra == "all"
@@ -87,7 +87,7 @@ Requires-Dist: pymysql~=1.1; extra == "sqldrivers"
 Requires-Dist: aiomysql~=0.2; extra == "sqldrivers"
 Requires-Dist: aiosqlite~=0.21; extra == "sqldrivers"
 Requires-Dist: asyncpg~=0.30; extra == "sqldrivers"
-Requires-Dist: apsw~=3.49; extra == "sqldrivers"
+Requires-Dist: apsw~=3.50; extra == "sqldrivers"
 Requires-Dist: sqlean.py~=3.49; extra == "sqldrivers"
 Requires-Dist: duckdb~=1.3; extra == "sqldrivers"
 Provides-Extra: templates

{omlish-0.0.0.dev325 → omlish-0.0.0.dev327}/omlish.egg-info/requires.txt

@@ -26,7 +26,7 @@ pymysql~=1.1
 aiomysql~=0.2
 aiosqlite~=0.21
 asyncpg~=0.30
-apsw~=3.49
+apsw~=3.50
 sqlean.py~=3.49
 duckdb~=1.3
 markupsafe~=3.0
@@ -85,7 +85,7 @@ pymysql~=1.1
 aiomysql~=0.2
 aiosqlite~=0.21
 asyncpg~=0.30
-apsw~=3.49
+apsw~=3.50
 sqlean.py~=3.49
 duckdb~=1.3
 

{omlish-0.0.0.dev325 → omlish-0.0.0.dev327}/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.dev325'
+version = '0.0.0.dev327'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -50,7 +50,7 @@ all = [
     'aiomysql ~= 0.2',
     'aiosqlite ~= 0.21',
     'asyncpg ~= 0.30',
-    'apsw ~= 3.49',
+    'apsw ~= 3.50',
     'sqlean.py ~= 3.49',
     'duckdb ~= 1.3',
     'markupsafe ~= 3.0',
@@ -107,7 +107,7 @@ sqldrivers = [
     'aiomysql ~= 0.2',
     'aiosqlite ~= 0.21',
     'asyncpg ~= 0.30',
-    'apsw ~= 3.49',
+    'apsw ~= 3.50',
     'sqlean.py ~= 3.49',
     'duckdb ~= 1.3',
 ]

omlish-0.0.0.dev325/omlish/testing/pytest/plugins/switches.py

@@ -1,184 +0,0 @@
-"""
-TODO:
- - inheritance
- - dynamic registration
- - dynamic switching (skip docker if not running, skip online if not online, ...)
-"""
-import dataclasses as dc
-import typing as ta
-
-import pytest
-
-from .... import check
-from .... import collections as col
-from ....docker import all as docker
-from ._registry import register
-
-
-Configable: ta.TypeAlias = pytest.FixtureRequest | pytest.Config
-
-
-##
-
-
-@dc.dataclass(frozen=True, eq=False)
-class Switch:
-    name: str
-    _default_enabled: bool | ta.Callable[[], bool]
-
-    _: dc.KW_ONLY
-
-    add_marks: ta.Sequence[ta.Any] | None = None
-
-    def default_enabled(self) -> bool:
-        if isinstance(e := self._default_enabled, bool):
-            return e
-        elif callable(e):
-            return check.isinstance(e(), bool)
-        else:
-            raise TypeError(e)
-
-    @property
-    def attr(self) -> str:
-        return self.name.replace('-', '_')
-
-
-SWITCHES: ta.Sequence[Switch] = [
-    Switch(
-        'name',
-        docker.has_cli,
-    ),
-
-    Switch(
-        'docker-guest',
-        docker.is_likely_in_docker,
-    ),
-
-    Switch(
-        'online',
-        True,
-    ),
-
-    Switch(
-        'integration',
-        True,
-    ),
-
-    Switch(
-        'high-mem',
-        True,
-        add_marks=[
-            # https://pytest-xdist.readthedocs.io/en/latest/distribution.html
-            pytest.mark.xdist_group('high-mem'),
-            pytest.mark.gc_collect_after(),
-        ],
-    ),
-
-    Switch(
-        'slow',
-        False,
-    ),
-]
-
-
-SWITCHES_BY_NAME: ta.Mapping[str, Switch] = col.make_map_by(lambda sw: sw.name, SWITCHES, strict=True)
-SWITCHES_BY_ATTR: ta.Mapping[str, Switch] = col.make_map_by(lambda sw: sw.attr, SWITCHES, strict=True)
-
-
-##
-
-
-SwitchState: ta.TypeAlias = bool | ta.Literal['only']
-
-SWITCH_STATE_OPT_PREFIXES: ta.Mapping[SwitchState, str] = {
-    True: '--',
-    False: '--no-',
-    'only': '--only-',
-}
-
-
-def _get_obj_config(obj: Configable) -> pytest.Config:
-    if isinstance(obj, pytest.Config):
-        return obj
-    elif isinstance(obj, pytest.FixtureRequest):
-        return obj.config
-    else:
-        raise TypeError(obj)
-
-
-def is_disabled(obj: Configable | None, name: str) -> bool:
-    check.isinstance(name, str)
-    check.in_(name, SWITCHES_BY_NAME)
-    return obj is not None and _get_obj_config(obj).getoption(f'--no-{name}')
-
-
-def skip_if_disabled(obj: Configable | None, name: str) -> None:
-    if is_disabled(obj, name):
-        pytest.skip(f'{name} disabled')
-
-
-def get_specified_switches(obj: Configable) -> dict[Switch, SwitchState]:
-    ret: dict[Switch, SwitchState] = {}
-    for sw in SWITCHES:
-        sts = {
-            st
-            for st, pfx in SWITCH_STATE_OPT_PREFIXES.items()
-            if _get_obj_config(obj).getoption(pfx + sw.name)
-        }
-        if sts:
-            if len(sts) > 1:
-                raise Exception(f'Multiple switches specified for {sw.name}')
-            ret[sw] = check.single(sts)
-    return ret
-
-
-@register
-class SwitchesPlugin:
-    def pytest_configure(self, config):
-        for sw in SWITCHES:
-            config.addinivalue_line('markers', f'{sw.attr}: mark test as {sw.attr}')
-            config.addinivalue_line('markers', f'not_{sw.attr}: mark test as not {sw.attr}')
-
-    def pytest_addoption(self, parser):
-        for sw in SWITCHES:
-            parser.addoption(f'--no-{sw.name}', action='store_true', default=False, help=f'disable {sw.name} tests')
-            parser.addoption(f'--{sw.name}', action='store_true', default=False, help=f'enables {sw.name} tests')
-            parser.addoption(f'--only-{sw.name}', action='store_true', default=False, help=f'enables only {sw.name} tests')  # noqa
-
-    def pytest_collection_modifyitems(self, config, items):
-        switch_states: dict[Switch, SwitchState] = {
-            **{
-                sw: sw.default_enabled()
-                for sw in SWITCHES
-            },
-            **get_specified_switches(config),
-        }
-
-        inv_switch_states: dict[SwitchState, list[Switch]] = col.multi_map((st, sw) for sw, st in switch_states.items())
-        true_switches = frozenset(inv_switch_states.get(True, ()))
-        false_switches = frozenset(inv_switch_states.get(False, ()))
-        only_switches = frozenset(inv_switch_states.get('only', ()))
-
-        def process(item):
-            item_switches = {sw for sw in SWITCHES if sw.attr in item.keywords}
-            item_not_switches = {sw for sw in SWITCHES if ('not_' + sw.attr) in item.keywords}
-
-            for sw in item_switches:
-                for mk in sw.add_marks or []:
-                    item.add_marker(mk)
-
-            if only_switches:
-                if not any(sw in only_switches for sw in item_switches):
-                    item.add_marker(pytest.mark.skip(reason=f'skipping switches {item_switches}'))
-                    return
-
-            for sw in item_switches:
-                if sw in false_switches:
-                    item.add_marker(pytest.mark.skip(reason=f'skipping switches {sw}'))
-
-            for sw in item_not_switches:
-                if sw in true_switches:
-                    item.add_marker(pytest.mark.skip(reason=f'skipping switches {sw}'))
-
-        for item in items:
-            process(item)