omlish 0.0.0.dev150__tar.gz → 0.0.0.dev151__tar.gz

{omlish-0.0.0.dev150/omlish.egg-info → omlish-0.0.0.dev151}/PKG-INFO

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

{omlish-0.0.0.dev150 → omlish-0.0.0.dev151}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev150'
-__revision__ = 'ab779edf0b58378203e055980af0fedacedb20aa'
+__version__ = '0.0.0.dev151'
+__revision__ = '7d978888ef2b04964976a01388376b919ec8bafe'
 
 
 #

omlish-0.0.0.dev150/omlish/docker/__init__.py → omlish-0.0.0.dev151/omlish/docker/all.py

@@ -13,10 +13,10 @@ from .compose import (  # noqa
     get_compose_port,
 )
 
-from .helpers import (  # noqa
+from .detect import (  # noqa
     DOCKER_HOST_PLATFORM_KEY,
     get_docker_host_platform,
-    timebomb_payload,
+    is_likely_in_docker,
 )
 
 from .hub import (  # noqa
@@ -26,12 +26,6 @@ from .hub import (  # noqa
     split_tag_suffix,
 )
 
-
-##
-
-
-from ..lite.docker import (  # noqa
-    DOCKER_FOR_MAC_HOSTNAME,
-
-    is_likely_in_docker,
+from .timebomb import (  # noqa
+    timebomb_payload,
 )

omlish-0.0.0.dev151/omlish/docker/consts.py

@@ -0,0 +1,4 @@
+# @omlish-lite
+
+
+DOCKER_FOR_MAC_HOSTNAME = 'docker.for.mac.localhost'

omlish-0.0.0.dev150/omlish/lite/docker.py → omlish-0.0.0.dev151/omlish/docker/detect.py

@@ -1,8 +1,23 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import os
 import re
 import sys
+import typing as ta
 
 
-DOCKER_FOR_MAC_HOSTNAME = 'docker.for.mac.localhost'
+##
+
+
+# Set by pyproject, docker-dev script
+DOCKER_HOST_PLATFORM_KEY = 'DOCKER_HOST_PLATFORM'
+
+
+def get_docker_host_platform() -> ta.Optional[str]:
+    return os.environ.get(DOCKER_HOST_PLATFORM_KEY)
+
+
+##
 
 
 _LIKELY_IN_DOCKER_PATTERN = re.compile(r'^overlay / .*/(docker|desktop-containerd)/')

omlish-0.0.0.dev150/omlish/docker/helpers.py → omlish-0.0.0.dev151/omlish/docker/timebomb.py

@@ -1,10 +1,6 @@
-import os
 import shlex
 
 
-##
-
-
 _DEFAULT_TIMEBOMB_NAME = '-'.join([*__name__.split('.'), 'timebomb'])
 
 
@@ -16,14 +12,3 @@ def timebomb_payload(delay_s: float, name: str = _DEFAULT_TIMEBOMB_NAME) -> str:
         'sh -c \'killall5 -9 -o $PPID -o $$ ; kill 1\''
         ') &'
     )
-
-
-##
-
-
-# Set by pyproject, docker-dev script
-DOCKER_HOST_PLATFORM_KEY = 'DOCKER_HOST_PLATFORM'
-
-
-def get_docker_host_platform() -> str | None:
-    return os.environ.get(DOCKER_HOST_PLATFORM_KEY)

{omlish-0.0.0.dev150 → omlish-0.0.0.dev151}/omlish/lite/check.py

@@ -14,7 +14,7 @@ T = ta.TypeVar('T')
 SizedT = ta.TypeVar('SizedT', bound=ta.Sized)
 
 CheckMessage = ta.Union[str, ta.Callable[..., ta.Optional[str]], None]  # ta.TypeAlias
-CheckLateConfigureFn = ta.Callable[['Checks'], None]
+CheckLateConfigureFn = ta.Callable[['Checks'], None]  # ta.TypeAlias
 CheckOnRaiseFn = ta.Callable[[Exception], None]  # ta.TypeAlias
 CheckExceptionFactory = ta.Callable[..., Exception]  # ta.TypeAlias
 CheckArgsRenderer = ta.Callable[..., ta.Optional[str]]  # ta.TypeAlias

{omlish-0.0.0.dev150 → omlish-0.0.0.dev151}/omlish/testing/pytest/plugins/switches.py

@@ -10,8 +10,8 @@ import pytest
 
 from .... import check
 from .... import collections as col
-from .... import docker
 from .... import lang
+from ....docker import all as docker
 from ._registry import register
 
 

{omlish-0.0.0.dev150 → omlish-0.0.0.dev151/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev150 → omlish-0.0.0.dev151}/omlish.egg-info/SOURCES.txt

@@ -180,11 +180,14 @@ omlish/dispatch/dispatch.py
 omlish/dispatch/functions.py
 omlish/dispatch/methods.py
 omlish/docker/__init__.py
+omlish/docker/all.py
 omlish/docker/cli.py
 omlish/docker/compose.py
-omlish/docker/helpers.py
+omlish/docker/consts.py
+omlish/docker/detect.py
 omlish/docker/hub.py
 omlish/docker/manifests.py
+omlish/docker/timebomb.py
 omlish/formats/__init__.py
 omlish/formats/dotenv.py
 omlish/formats/props.py
@@ -339,7 +342,6 @@ omlish/lite/cached.py
 omlish/lite/check.py
 omlish/lite/contextmanagers.py
 omlish/lite/deathsig.py
-omlish/lite/docker.py
 omlish/lite/inject.py
 omlish/lite/journald.py
 omlish/lite/json.py

{omlish-0.0.0.dev150 → omlish-0.0.0.dev151}/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.dev150'
+version = '0.0.0.dev151'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',