omlish 0.0.0.dev324__py3-none-any.whl → 0.0.0.dev326__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev324'
-__revision__ = 'f4f05345419ff5a1267aac207d5269c82156e71a'
+__version__ = '0.0.0.dev326'
+__revision__ = 'c2dd50f058b892485bea3f5ed42bfb88c8439c3c'
 
 
 #
@@ -99,7 +99,7 @@ class Project(ProjectBase):
             'aiosqlite ~= 0.21',
             'asyncpg ~= 0.30',
 
-            'apsw ~= 3.49',
+            'apsw ~= 3.50',
 
             'sqlean.py ~= 3.49',
 

omlish/diag/pycharm.py

@@ -14,12 +14,12 @@ from .. import lang
 if ta.TYPE_CHECKING:
     import plistlib
 
-    from .. import docker
+    from ..docker import all as docker
 
 else:
     plistlib = lang.proxy_import('plistlib')
 
-    docker = lang.proxy_import('..docker')
+    docker = lang.proxy_import('..docker.all')
 
 
 ##

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/testing/pytest/plugins/depskip.py

@@ -66,7 +66,7 @@ class DepSkipPlugin:
             collector._getobj = _patched_getobj  # type: ignore  # noqa
 
 
-def register(
+def regex_register(
         pm: pytest.PytestPluginManager,
         file_pats: ta.Iterable[str],
         imp_pats: ta.Iterable[str],
@@ -79,3 +79,22 @@ def register(
         [re.compile(fp) for fp in file_pats],
         [re.compile(ip) for ip in imp_pats],
     ))
+
+
+def module_register(
+        pm: pytest.PytestPluginManager,
+        mods: ta.Iterable[str],
+        imp_mods: ta.Iterable[str],
+) -> None:
+    check.not_isinstance(mods, str)
+    check.not_isinstance(imp_mods, str)
+
+    for m in [*mods, *imp_mods]:
+        check.non_empty_str(m)
+        check.arg(all(p.isidentifier() for p in m.split('.')), m)
+
+    regex_register(
+        pm,
+        [rf'{re.escape(m.replace(".", "/"))}/.*\.py' for m in mods],
+        [rf'{re.escape(m.replace(".", "/"))}(\..*)?' for m in imp_mods],
+    )

omlish/testing/pytest/plugins/switches.py

@@ -5,6 +5,7 @@ TODO:
  - dynamic switching (skip docker if not running, skip online if not online, ...)
 """
 import dataclasses as dc
+import enum
 import typing as ta
 
 import pytest
@@ -21,20 +22,27 @@ 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_enabled: bool | ta.Callable[[], bool]
+    _default_state: SwitchState | ta.Callable[[pytest.Session], SwitchState]
 
     _: dc.KW_ONLY
 
     add_marks: ta.Sequence[ta.Any] | None = None
 
-    def default_enabled(self) -> bool:
-        if isinstance(e := self._default_enabled, bool):
+    def default_state(self, session: pytest.Session) -> SwitchState:
+        if isinstance(e := self._default_state, SwitchState):
             return e
         elif callable(e):
-            return check.isinstance(e(), bool)
+            return check.isinstance(e(session), SwitchState)
         else:
             raise TypeError(e)
 
@@ -46,27 +54,27 @@ class Switch:
 SWITCHES: ta.Sequence[Switch] = [
     Switch(
         'name',
-        docker.has_cli,
+        lambda _: SwitchState.ENABLED if docker.has_cli() else SwitchState.DISABLED,
     ),
 
     Switch(
         'docker-guest',
-        docker.is_likely_in_docker,
+        lambda _: SwitchState.ENABLED if docker.is_likely_in_docker() else SwitchState.DISABLED,
     ),
 
     Switch(
         'online',
-        True,
+        SwitchState.ENABLED,
     ),
 
     Switch(
         'integration',
-        True,
+        SwitchState.ENABLED,
     ),
 
     Switch(
         'high-mem',
-        True,
+        SwitchState.ENABLED,
         add_marks=[
             # https://pytest-xdist.readthedocs.io/en/latest/distribution.html
             pytest.mark.xdist_group('high-mem'),
@@ -76,7 +84,7 @@ SWITCHES: ta.Sequence[Switch] = [
 
     Switch(
         'slow',
-        False,
+        SwitchState.IF_SINGLE,
     ),
 ]
 
@@ -88,12 +96,10 @@ SWITCHES_BY_ATTR: ta.Mapping[str, Switch] = col.make_map_by(lambda sw: sw.attr,
 ##
 
 
-SwitchState: ta.TypeAlias = bool | ta.Literal['only']
-
 SWITCH_STATE_OPT_PREFIXES: ta.Mapping[SwitchState, str] = {
-    True: '--',
-    False: '--no-',
-    'only': '--only-',
+    SwitchState.ENABLED: '--',
+    SwitchState.DISABLED: '--no-',
+    SwitchState.ONLY: '--only-',
 }
 
 
@@ -132,53 +138,99 @@ def get_specified_switches(obj: Configable) -> dict[Switch, SwitchState]:
     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_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()
+    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
-            },
-            **get_specified_switches(config),
-        }
+            }
+
+            self.states_by_switch: dict[Switch, SwitchState] = {
+                **self.default_states_by_switch,
+                **get_specified_switches(session.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', ()))
+            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()
+            }
 
-        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}
+    _states_key: ta.ClassVar[pytest.StashKey[_States]] = pytest.StashKey[_States]()
 
-            for sw in item_switches:
+    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:
-                if not any(sw in only_switches for sw in item_switches):
-                    item.add_marker(pytest.mark.skip(reason=f'skipping switches {item_switches}'))
+            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
 
-            for sw in item_switches:
-                if sw in false_switches:
-                    item.add_marker(pytest.mark.skip(reason=f'skipping switches {sw}'))
+            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)'))
 
-            for sw in item_not_switches:
-                if sw in true_switches:
-                    item.add_marker(pytest.mark.skip(reason=f'skipping switches {sw}'))
+            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)
+            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.dev324.dist-info → omlish-0.0.0.dev326.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev324
+Version: 0.0.0.dev326
 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.dev324.dist-info → omlish-0.0.0.dev326.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=RIJDWJT7aTvq6WVukFxeI8leEd-msgKydBtuT4dvSqc,3478
+omlish/__about__.py,sha256=UoJfm6_oqNZqXXNxGuPSwyPZfi4oLWZWRWwT6V3IWhw,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -211,7 +211,7 @@ omlish/diag/lsof.py,sha256=DnowqvKYah-WCuBHS3DAcZCvlsWJdM9kYNFq97UZDDA,9127
 omlish/diag/procfs.py,sha256=KaGTAA2Gj8eEEp7MjClRe4aimwzd-HDABThFzvq2cBQ,9684
 omlish/diag/procstats.py,sha256=EJEe2Zc58ykBoTfqMXro7H52aQa_pd6uC2hsIPFceso,825
 omlish/diag/ps.py,sha256=b7ai9O4mGZliNFvBu6PdQfMmct4qpcMTygEf1ISHBLQ,1666
-omlish/diag/pycharm.py,sha256=Z2W-Viqw5xq08ZC4z36skpozfYw_qNNhWQx_GYr2D0k,4695
+omlish/diag/pycharm.py,sha256=9Mgn5T2ZdlEUL3VV-GzVmCBs_ZtIpLwaUzP6pgHEUEo,4712
 omlish/diag/pydevd.py,sha256=UN55ZjkWLCVyHxE2CNRRYamuvSKfzWsn0D5oczRTXO4,7536
 omlish/diag/threads.py,sha256=1-x02VCDZ407gfbtXm1pWK-ubqhqfePm9PMqkHCVoqk,3642
 omlish/diag/_pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -228,7 +228,7 @@ omlish/dispatch/functions.py,sha256=cwNzGIg2ZIalEgn9I03cnJVbMTHjWloyDTaowlO3UPs,
 omlish/dispatch/impls.py,sha256=K_okKvpZml4NkTHJmTVyMQSrIaIJcqTEgkreGwukaOw,1895
 omlish/dispatch/methods.py,sha256=GdVsC-Zo3N-OorE0mr3lFI70dATkD2aWqZ8TvExiR5k,9297
 omlish/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/docker/all.py,sha256=xXRgJgLGPwAtr7bDMJ_Dp9jTfOwfGvohNhc6LsoELJc,514
+omlish/docker/all.py,sha256=t5jBNZAzqCoB05-nwCuSZ6C3PBEBD6T3wsIJvIXJaRg,576
 omlish/docker/cli.py,sha256=gtb9kitVfGnd4cr587NsVVk8D5Ok5y5SAsqD_SwGrSA,2565
 omlish/docker/compose.py,sha256=4drmnGQzbkOFJ9B6XSg9rnXkJeZz1ETmdcMe1PE790U,1237
 omlish/docker/consts.py,sha256=wvwfUtEFrEWZKfREWqSMrx8xjjl8P5MNUSF6qzzgJHY,70
@@ -746,14 +746,14 @@ omlish/testing/pytest/inject/__init__.py,sha256=pdRKv1HcDmJ_yArKJbYITPXXZthRSGgB
 omlish/testing/pytest/inject/harness.py,sha256=_Qf7lLcYc_dpauYOE68u_a65jPCFWmQUYv9m_OOdNqs,5724
 omlish/testing/pytest/plugins/__init__.py,sha256=ys1zXrYrNm7Uo6YOIVJ6Bd3dQo6kv387k7MbTYlqZSI,467
 omlish/testing/pytest/plugins/_registry.py,sha256=IK04KlBgiOJxKAyCCgjpX2R-9tE-btalYJkgjLc8Te8,77
-omlish/testing/pytest/plugins/depskip.py,sha256=xithY-OMtjwhv8mcRNkv-WI_PSQtHldQ8H1s60MIXkk,2673
+omlish/testing/pytest/plugins/depskip.py,sha256=9xsvf4Py31Cc3RMUBA-BcTkOstLmYsU1GA4iwNr3fPo,3209
 omlish/testing/pytest/plugins/logging.py,sha256=ZUy4sQOMYroZubUnjYe4_KC1kqukgBbA84VjO0NwfsA,390
 omlish/testing/pytest/plugins/managermarks.py,sha256=IzkspjT8-ToPIlHZs9cHt6RYbm51poJLjYVvkFPbJhE,1300
 omlish/testing/pytest/plugins/pydevd.py,sha256=5moE64LrNRV6gKRaeCuONDiwuh-4UFxJPWD9K9PR8GM,841
 omlish/testing/pytest/plugins/repeat.py,sha256=jiZCI-17042jBvUEbZCxNwqWtr7s3EhTBSeSHh_Uz4E,497
 omlish/testing/pytest/plugins/skips.py,sha256=eMir_n777Kk2BvOwjQzRROKL4iAMYKSHFwWCHJ-bdPI,1040
 omlish/testing/pytest/plugins/spacing.py,sha256=tzq-L-exegHe2BImumkYIsVcUwpUUhLJJOuSrsKDuCU,706
-omlish/testing/pytest/plugins/switches.py,sha256=t4kzdB_4Isp_cUtseKKMGHZ6cTriX3VGrzuqmNHCgMg,5210
+omlish/testing/pytest/plugins/switches.py,sha256=z3TKe2NHBOaa_cmarWTRJo519iCNDff4e0XSfHkajHU,7365
 omlish/testing/pytest/plugins/utils.py,sha256=L5C622UXcA_AUKDcvyh5IMiRfqSGGz0McdhwZWvfMlU,261
 omlish/testing/pytest/plugins/asyncs/__init__.py,sha256=TTNhFmP_krug1973sq_bpWBTIvg68-1nbuVLSs92Z6k,41
 omlish/testing/pytest/plugins/asyncs/consts.py,sha256=0NOCkzV43dOu3u97BqYMQ4mPG8JuFncpWibkOZpCqX4,55
@@ -857,9 +857,9 @@ omlish/typedvalues/holder.py,sha256=ZTnHiw-K38ciOBLEdwgrltr7Xp8jjEs_0Lp69DH-G-o,
 omlish/typedvalues/marshal.py,sha256=hWHRLcrGav7lvXJDtb9bNI0ickl4SKPQ6F4BbTpqw3A,4219
 omlish/typedvalues/reflect.py,sha256=Ih1YgU-srUjsvBn_P7C66f73_VCvcwqE3ffeBnZBgt4,674
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev324.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev324.dist-info/METADATA,sha256=cvoRr807Bf7z8c0DJfoo46V0v17yj6akOnN34Pr6mZk,4416
-omlish-0.0.0.dev324.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev324.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev324.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev324.dist-info/RECORD,,
+omlish-0.0.0.dev326.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev326.dist-info/METADATA,sha256=TU88zs941JZBexTmeINDhh8lNdgCPbBLmdDZ8E2kV5I,4416
+omlish-0.0.0.dev326.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev326.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev326.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev326.dist-info/RECORD,,