omlish 0.0.0.dev30__tar.gz → 0.0.0.dev31__tar.gz

{omlish-0.0.0.dev30/omlish.egg-info → omlish-0.0.0.dev31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev30
+Version: 0.0.0.dev31
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -13,7 +13,7 @@ Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
 Provides-Extra: all
-Requires-Dist: anyio~=4.5; extra == "all"
+Requires-Dist: anyio~=4.6; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
 Requires-Dist: greenlet~=3.1; extra == "all"
 Requires-Dist: trio~=0.26; extra == "all"
@@ -42,7 +42,7 @@ 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"
 Provides-Extra: async
-Requires-Dist: anyio~=4.5; extra == "async"
+Requires-Dist: anyio~=4.6; extra == "async"
 Requires-Dist: sniffio~=1.3; extra == "async"
 Requires-Dist: greenlet~=3.1; extra == "async"
 Requires-Dist: trio~=0.26; extra == "async"

{omlish-0.0.0.dev30 → omlish-0.0.0.dev31}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev30'
-__revision__ = '1378b0a61f7d3ec16204c06bc87e5215b062d378'
+__version__ = '0.0.0.dev31'
+__revision__ = 'bd655a8d18c1cc31ce2c9d79fedaec771c5e1593'
 
 
 #
@@ -30,7 +30,7 @@ class Project(ProjectBase):
 
     optional_dependencies = {
         'async': [
-            'anyio ~= 4.5',
+            'anyio ~= 4.6',
             'sniffio ~= 1.3',
 
             'greenlet ~= 3.1',

{omlish-0.0.0.dev30 → omlish-0.0.0.dev31}/omlish/asyncs/anyio.py

@@ -4,7 +4,7 @@ TODO:
   - owned lock
   - async once
 
-lookit:
+See:
  - https://github.com/davidbrochart/sqlite-anyio/blob/a3ba4c6ef0535b14a5a60071fcd6ed565a514963/sqlite_anyio/sqlite.py
  - https://github.com/rafalkrupinski/ratelimit-anyio/blob/2910a8a3d6fa54ed17ee6ba457686c9f7a4c4beb/src/ratelimit_anyio/__init__.py
  - https://github.com/nekitdev/async-extensions/tree/main/async_extensions

{omlish-0.0.0.dev30 → omlish-0.0.0.dev31}/omlish/asyncs/bridge.py

@@ -12,8 +12,9 @@ TODO:
 See:
  - https://greenback.readthedocs.io/en/latest/
 """
+import functools  # noqa
 import itertools
-import sys
+import sys  # noqa
 import types
 import typing as ta
 import weakref
@@ -90,7 +91,7 @@ class UnexpectedBridgeNestingError(Exception):
 
 
 _DEBUG_PRINT: ta.Callable[..., None] | None = None
-# _DEBUG_PRINT = print  # noqa
+# _DEBUG_PRINT = functools.partial(print, file=sys.stderr)  # noqa
 
 _TRACK_TRANSITION_OBJS = False
 
@@ -253,8 +254,8 @@ def s_to_a(fn, *, require_await=False):
                 switch_occurred = True
                 try:
                     value = yield result
-                except BaseException:  # noqa
-                    result = g.throw(*sys.exc_info())
+                except BaseException as e:  # noqa
+                    result = g.throw(e)
                 else:
                     result = g.switch(value)
 
@@ -302,15 +303,22 @@ def a_to_s(fn):
 
             cr = gate()
             sv = None
+            he = False
             try:
                 while True:
-                    try:
-                        sv = cr.send(sv)
-                    except StopIteration:
-                        break
+                    if not he:
+                        try:
+                            sv = cr.send(sv)
+                        except StopIteration:
+                            break
+                    he = False
 
                     if ret is missing or cr.cr_await is not None or cr.cr_running:
-                        sv = s_to_a_await(sv)
+                        try:
+                            sv = s_to_a_await(sv)  # type: ignore
+                        except BaseException as e:  # noqa
+                            sv = cr.throw(e)
+                            he = True
 
             finally:
                 cr.close()

{omlish-0.0.0.dev30 → omlish-0.0.0.dev31}/omlish/asyncs/trio.py

@@ -1,5 +1,5 @@
 """
-lookit:
+See:
  - https://github.com/oremanj/trio-monitor
  - https://github.com/python-trio/trio-monitor/tree/master
  - https://github.com/python-trio/triopg

{omlish-0.0.0.dev30 → omlish-0.0.0.dev31}/omlish/bootstrap/main.py

@@ -1,3 +1,8 @@
+"""
+TODO:
+ - -x / --exec - os.exec entrypoint
+  - refuse to install non-exec-relevant Bootstraps when chosen
+"""
 # ruff: noqa: UP006 UP007
 import argparse
 import dataclasses as dc

{omlish-0.0.0.dev30 → omlish-0.0.0.dev31}/omlish/concurrent/threadlets.py

@@ -48,7 +48,7 @@ class Threadlet(abc.ABC):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def throw(self, ex: Exception) -> ta.Any:
+    def throw(self, ex: BaseException) -> ta.Any:
         raise NotImplementedError
 
 
@@ -84,7 +84,7 @@ class GreenletThreadlet(Threadlet):
     def switch(self, *args: ta.Any, **kwargs: ta.Any) -> ta.Any:
         return self.g.switch(*args, **kwargs)
 
-    def throw(self, ex: Exception) -> ta.Any:
+    def throw(self, ex: BaseException) -> ta.Any:
         return self.g.throw(ex)
 
 

{omlish-0.0.0.dev30 → omlish-0.0.0.dev31}/omlish/docker.py

@@ -107,6 +107,15 @@ def cli_inspect(ids: list[str]) -> list[Inspect]:
     return msh.unmarshal(json.loads(o.decode()), list[Inspect])
 
 
+def has_cli() -> bool:
+    try:
+        proc = subprocess.run(['docker', '--version'])  # noqa
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        return False
+    else:
+        return not proc.returncode
+
+
 ##
 
 

{omlish-0.0.0.dev30 → omlish-0.0.0.dev31}/omlish/logs/noisy.py

@@ -5,6 +5,7 @@ NOISY_LOGGERS: set[str] = {
     'boto3.resources.action',
     'datadog.dogstatsd',
     'elasticsearch',
+    'httpx',
     'kazoo.client',
     'requests.packages.urllib3.connectionpool',
 }

{omlish-0.0.0.dev30 → omlish-0.0.0.dev31}/omlish/matchfns.py

@@ -130,7 +130,7 @@ def multi(*children: MatchFn[P, T], strict: bool = False) -> MultiMatchFn:  # Mu
 ##
 
 
-class CachedMultiFn(MatchFn[P, T]):
+class CachedMatchFn(MatchFn[P, T]):
     @staticmethod
     def _default_key(*args, **kwargs):
         return (args, tuple(sorted(kwargs.items(), key=lambda t: t[0])))
@@ -187,7 +187,7 @@ class CachedMultiFn(MatchFn[P, T]):
         return self.__class__(self._f.__get__(instance, owner), key=self._key)  # noqa
 
 
-cached = CachedMultiFn
+cached = CachedMatchFn
 
 
 ##

{omlish-0.0.0.dev30 → omlish-0.0.0.dev31}/omlish/testing/pytest/plugins/switches.py

@@ -10,19 +10,24 @@ import pytest
 
 from .... import check
 from .... import collections as col
+from .... import docker
+from .... import lang
 from ._registry import register
 
 
 Configable = pytest.FixtureRequest | pytest.Config
 
 
-SWITCHES = {
-    'docker': True,
+SWITCHES: ta.Mapping[str, bool | ta.Callable[[], bool]] = {
+    'docker': docker.has_cli,
+    'docker-guest': docker.is_likely_in_docker,
     'online': True,
     'integration': True,
     'slow': False,
 }
 
+SWITCH_ATTRS = {k.replace('-', '_'): k for k in SWITCHES}
+
 
 SwitchState: ta.TypeAlias = bool | ta.Literal['only']
 
@@ -53,9 +58,9 @@ def skip_if_disabled(obj: Configable | None, name: str) -> None:
         pytest.skip(f'{name} disabled')
 
 
-def get_switches(obj: Configable) -> ta.Mapping[str, SwitchState]:
+def get_specified_switches(obj: Configable) -> ta.Mapping[str, SwitchState]:
     ret: dict[str, SwitchState] = {}
-    for sw, d in SWITCHES.items():
+    for sw in SWITCHES:
         sts = {
             st
             for st, pfx in SWITCH_STATE_OPT_PREFIXES.items()
@@ -65,8 +70,6 @@ def get_switches(obj: Configable) -> ta.Mapping[str, SwitchState]:
             if len(sts) > 1:
                 raise Exception(f'Multiple switches specified for {sw}')
             ret[sw] = check.single(sts)
-        else:
-            ret[sw] = d
     return ret
 
 
@@ -74,8 +77,9 @@ def get_switches(obj: Configable) -> ta.Mapping[str, SwitchState]:
 class SwitchesPlugin:
 
     def pytest_configure(self, config):
-        for sw in SWITCHES:
+        for sw in SWITCH_ATTRS:
             config.addinivalue_line('markers', f'{sw}: mark test as {sw}')
+            config.addinivalue_line('markers', f'not_{sw}: mark test as not {sw}')
 
     def pytest_addoption(self, parser):
         for sw in SWITCHES:
@@ -83,13 +87,25 @@ class SwitchesPlugin:
             parser.addoption(f'--{sw}', action='store_true', default=False, help=f'enables {sw} tests')
             parser.addoption(f'--only-{sw}', action='store_true', default=False, help=f'enables only {sw} tests')
 
+    @lang.cached_function
+    def get_switches(self) -> ta.Mapping[str, SwitchState]:
+        return {
+            k: v() if callable(v) else v
+            for k, v in SWITCHES.items()
+        }
+
     def pytest_collection_modifyitems(self, config, items):
-        sts = get_switches(config)
+        sts = {
+            **self.get_switches(),
+            **get_specified_switches(config),
+        }
+
         stx = col.multi_map(map(reversed, sts.items()))  # type: ignore
         ts, fs, onlys = (stx.get(k, ()) for k in (True, False, 'only'))
 
         def process(item):
-            sws = {sw for sw in SWITCHES if sw in item.keywords}
+            sws = {sw for swa, sw in SWITCH_ATTRS.items() if swa in item.keywords}
+            nsws = {sw for swa, sw in SWITCH_ATTRS.items() if ('not_' + swa) in item.keywords}
 
             if onlys:
                 if not any(sw in onlys for sw in sws):
@@ -101,5 +117,9 @@ class SwitchesPlugin:
                     if sw in fs:
                         item.add_marker(pytest.mark.skip(reason=f'skipping switches {sw}'))
 
+                for nsw in nsws:
+                    if nsw in ts:
+                        item.add_marker(pytest.mark.skip(reason=f'skipping switches {nsw}'))
+
         for item in items:
             process(item)

{omlish-0.0.0.dev30 → omlish-0.0.0.dev31/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev30
+Version: 0.0.0.dev31
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -13,7 +13,7 @@ Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
 Provides-Extra: all
-Requires-Dist: anyio~=4.5; extra == "all"
+Requires-Dist: anyio~=4.6; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
 Requires-Dist: greenlet~=3.1; extra == "all"
 Requires-Dist: trio~=0.26; extra == "all"
@@ -42,7 +42,7 @@ 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"
 Provides-Extra: async
-Requires-Dist: anyio~=4.5; extra == "async"
+Requires-Dist: anyio~=4.6; extra == "async"
 Requires-Dist: sniffio~=1.3; extra == "async"
 Requires-Dist: greenlet~=3.1; extra == "async"
 Requires-Dist: trio~=0.26; extra == "async"

{omlish-0.0.0.dev30 → omlish-0.0.0.dev31}/omlish.egg-info/requires.txt

@@ -1,6 +1,6 @@
 
 [all]
-anyio~=4.5
+anyio~=4.6
 sniffio~=1.3
 greenlet~=3.1
 trio~=0.26
@@ -32,7 +32,7 @@ asyncpg~=0.29
 sqlean.py~=3.45
 
 [async]
-anyio~=4.5
+anyio~=4.6
 sniffio~=1.3
 greenlet~=3.1
 trio~=0.26

{omlish-0.0.0.dev30 → omlish-0.0.0.dev31}/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.dev30'
+version = '0.0.0.dev31'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -24,7 +24,7 @@ description = 'omlish'
 
 [project.optional-dependencies]
 all = [
-    'anyio ~= 4.5',
+    'anyio ~= 4.6',
     'sniffio ~= 1.3',
     'greenlet ~= 3.1',
     'trio ~= 0.26',
@@ -54,7 +54,7 @@ all = [
     'pytest ~= 8.0',
 ]
 async = [
-    'anyio ~= 4.5',
+    'anyio ~= 4.6',
     'sniffio ~= 1.3',
     'greenlet ~= 3.1',
     'trio ~= 0.26',