omdev 0.0.0.dev541__tar.gz → 0.0.0.dev542__tar.gz

{omdev-0.0.0.dev541/omdev.egg-info → omdev-0.0.0.dev542}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev541
+Version: 0.0.0.dev542
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev541
+Requires-Dist: omlish==0.0.0.dev542
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev541 → omdev-0.0.0.dev542}/omdev/dockerdev/cli.py

@@ -13,43 +13,11 @@ TODO:
 
 ====
 
-if [ -t 1 ] ; then
-   TTY_ENV_ARGS="-e LINES=$(tput lines) -e COLUMNS=$(tput cols)"
-else
-   TTY_ENV_ARGS=""
-fi
-
-SERVICE_NAME="$(basename "$SCRIPT_DIR")-dev"
-if ! [ $# -eq 0 ] ; then
-    if [ "$1" = "--amd64" ] ; then
-        SERVICE_NAME="$SERVICE_NAME-amd64"
-        shift
-    fi
-fi
-
-CONTAINER_ID=$(docker-compose -f 'docker/compose.yml' ps -q "$SERVICE_NAME")
-if [ -z "$CONTAINER_ID" ] ; then
-    echo "$SERVICE_NAME not running" 1>&2
-    exit 1
-fi
-
-if [ -z "$DOCKER_HOST_PLATFORM" ] ; then
-    if [ $(uname) = "Linux" ] ; then
-        DOCKER_HOST_PLATFORM=linux
-    elif [ $(uname) = "Darwin" ] ; then
-        DOCKER_HOST_PLATFORM=darwin
-    fi
-fi
-
-exec docker exec \
-    $TTY_ENV_ARGS \
-    -e DOCKER_HOST_PLATFORM="$DOCKER_HOST_PLATFORM" \
-    --privileged \
-    --detach-keys 'ctrl-o,ctrl-d' \
-    -it "$CONTAINER_ID" \
-    "$@"
+if [ -t 1 ] ; then TTY_ENV_ARGS="-e LINES=$(tput lines) -e COLUMNS=$(tput cols)" ; fi
+--detach-keys 'ctrl-o,ctrl-d' \
 """
 import os.path
+import platform
 import re
 import shutil
 import subprocess
@@ -155,8 +123,15 @@ class Cli(ap.Cli):
 
     @ap.cmd(
         ap.arg('-v', '--verbose', action='store_true'),
+
         ap.arg('-C', '--mount-caches', action='store_true'),
+        ap.arg('-D', '--mount-docker-sock', action='store_true'),
+        ap.arg('-P', '--privileged', action='store_true'),
+
+        ap.arg('--no-host-platform', action='store_true'),
+
         ap.arg('-x', '--autoexec', action='append'),
+
         ap.arg('args', nargs=ap.REMAINDER),
         accepts_unknown=True,
     )
@@ -182,6 +157,12 @@ class Cli(ap.Cli):
                 '-it',
             ])
 
+        if self.args.privileged:
+            run_args.append('--privileged')
+
+        if self.args.mount_docker_sock:
+            run_args.append('--mount=type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock')
+
         if self.args.mount_caches:
             cache_dir = os.path.join(get_cache_dir(), 'dockerdev')
             for cl, cr in (cfg.cache_mounts or {}).items():
@@ -190,6 +171,9 @@ class Cli(ap.Cli):
                 os.makedirs(cld, exist_ok=True)
                 run_args.append(f'--mount=type=bind,src={cld},dst={cr}')
 
+        if not self.args.no_host_platform:
+            run_args.extend(['-e', f'DOCKER_HOST_PLATFORM={platform.system().lower()}'])
+
         if self.args.autoexec:
             tmp_dir = tempfile.mkdtemp()
             tmp_ep = os.path.join(tmp_dir, 'entrypoint.sh')

{omdev-0.0.0.dev541 → omdev-0.0.0.dev542}/omdev/pyproject/cli.py

@@ -104,7 +104,7 @@ class Run:
 
 
 class PyprojectCli(ArgparseCli):
-    _docker_container = argparse_arg('--_docker_container', help=argparse.SUPPRESS)
+    _current_docker_service = argparse_arg('--_current_docker_service', help=argparse.SUPPRESS)
 
     @argparse_cmd(
         argparse_arg('name'),
@@ -114,11 +114,11 @@ class PyprojectCli(ArgparseCli):
     )
     async def venv(self) -> None:
         venv = Run().venvs()[self.args.name]
-        if (sd := venv.cfg.docker) is not None and sd != (cd := self.args._docker_container):  # noqa
+        if (sd := venv.cfg.docker_service) is not None and sd != (cd := self.args._current_docker_service):  # noqa
             script = ' '.join([
                 'python3',
                 shlex.quote(_script_rel_path()),
-                f'--_docker_container={shlex.quote(sd)}',
+                f'--_current_docker_service={shlex.quote(sd)}',
                 *map(shlex.quote, sys.argv[1:]),
             ])
 

{omdev-0.0.0.dev541 → omdev-0.0.0.dev542}/omdev/pyproject/configs.py

@@ -13,7 +13,7 @@ from ..interp.venvs import InterpVenvConfig
 @dc.dataclass(frozen=True)
 class VenvConfig(InterpVenvConfig):
     inherits: ta.Optional[ta.Sequence[str]] = None
-    docker: ta.Optional[str] = None
+    docker_service: ta.Optional[str] = None
     srcs: ta.Optional[ta.List[str]] = None
 
 

{omdev-0.0.0.dev541 → omdev-0.0.0.dev542}/omdev/scripts/ci.py

@@ -93,7 +93,7 @@ def __omlish_amalg__():  # noqa
             dict(path='github/env.py', sha1='c7a2389048f008f46f59f6bcc11e0d15655f2b1c'),
             dict(path='shell.py', sha1='a59e59b812394d0502837f4c198e1cf604f90227'),
             dict(path='../oci/compression.py', sha1='7d165bc51a77db13ff45927daecc42839cfd75ea'),
-            dict(path='../../omlish/asyncs/asyncio/utils.py', sha1='34691d4d0e5bab68f14e193a6200df040cfd0136'),
+            dict(path='../../omlish/asyncs/asyncio/utils.py', sha1='1ab917e62b40dae3744ba2eb3d10c85ddffe08a4'),
             dict(path='../../omlish/docker/ports.py', sha1='a3202c69b85bc4f1034479df3400fddc86130e5c'),
             dict(path='../../omlish/http/urllib.py', sha1='25431c5bdc7dd5cbecfcb8c0bdffaabf8c1691b9'),
             dict(path='../../omlish/http/versions.py', sha1='5b1659b81eb197c6880fbe78684a1348595ec804'),
@@ -494,6 +494,46 @@ async def asyncio_wait_maybe_concurrent(
         return await asyncio_wait_concurrent(awaitables, concurrency)
 
 
+##
+
+
+@contextlib.asynccontextmanager
+async def asyncio_shielded_finally(
+    fn: ta.Callable[[], ta.Awaitable[ta.Any]],
+    *,
+    timeout: ta.Optional[float] = 5,
+) -> ta.AsyncIterator[None]:
+    try:
+        yield
+
+    finally:
+        end_task = asyncio.create_task(fn())  # type: ignore  # noqa
+
+        if timeout is None:
+            try:
+                await asyncio.shield(end_task)
+
+            except asyncio.CancelledError:
+                try:
+                    await end_task
+
+                finally:
+                    raise
+
+        else:
+            dl = time.monotonic() + timeout
+
+            try:
+                await asyncio.wait_for(asyncio.shield(end_task), timeout=time.monotonic() - dl)
+
+            except asyncio.CancelledError:
+                try:
+                    await asyncio.wait_for(end_task, timeout=time.monotonic() - dl)
+
+                finally:
+                    raise
+
+
 ########################################
 # ../../../omlish/docker/ports.py
 """

{omdev-0.0.0.dev541 → omdev-0.0.0.dev542}/omdev/scripts/pyproject.py

@@ -91,7 +91,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../magic/styles.py', sha1='60fc56d089669eaad72c5c134b91bc69d4bc107e'),
             dict(path='../packaging/versions.py', sha1='71627ad600b3529b829b0e227b0952f2c63c7271'),
             dict(path='../packaging/wheelfile.py', sha1='2e1113819aa85ed00e1fe25c71a2b3dbc0a383f5'),
-            dict(path='../../omlish/formats/toml/parser.py', sha1='73dac82289350ab951c4bcdbfe61167fa221f26f'),
+            dict(path='../../omlish/formats/toml/parser.py', sha1='275d1321063cfa9d662ca458af3cb2801b9140ce'),
             dict(path='../../omlish/formats/toml/writer.py', sha1='6ea41d7e724bb1dcf6bd84b88993ff4e8798e021'),
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
@@ -156,9 +156,9 @@ def __omlish_amalg__():  # noqa
             dict(path='../interp/inject.py', sha1='b039abbadf0b096d2724182af2e0ebda2a230852'),
             dict(path='../interp/default.py', sha1='a799969a0d3f4b57538587b13ceb08f6334ebc16'),
             dict(path='../interp/venvs.py', sha1='9ba8f2c3131d7d519d5cf36ca69b75f9c6fe2b27'),
-            dict(path='configs.py', sha1='9e93e810184f9d6c7efd4a149dd5fbc9ad50d611'),
+            dict(path='configs.py', sha1='d2a324772cff23b10a7ba0037703f9938a9cff12'),
             dict(path='venvs.py', sha1='9f1935171017aeb802da56e14d7f41d632a7aa25'),
-            dict(path='cli.py', sha1='ecf31ccef6b0e1d1505b46d24faf076b6be32760'),
+            dict(path='cli.py', sha1='f30e9b2ffc657899163dc3cc213c5fbf64a0b94f'),
         ],
     )
 
@@ -1033,6 +1033,12 @@ class WheelFile(zipfile.ZipFile):
 # License Agreement.
 #
 # https://github.com/python/cpython/blob/9ce90206b7a4649600218cf0bd4826db79c9a312/Lib/tomllib/_parser.py
+#
+# TODO:
+#  - 1.1:
+#    - https://github.com/python/cpython/commit/bb917d83b16231ad5193731f0405fbc53122d68b
+#    - https://github.com/toml-lang/toml/blob/main/CHANGELOG.md#110--2025-12-18
+#  - emit wrapped tokens / preserve whitespace / rewriting
 
 
 ##
@@ -12764,7 +12770,7 @@ class InterpVenv:
 @dc.dataclass(frozen=True)
 class VenvConfig(InterpVenvConfig):
     inherits: ta.Optional[ta.Sequence[str]] = None
-    docker: ta.Optional[str] = None
+    docker_service: ta.Optional[str] = None
     srcs: ta.Optional[ta.List[str]] = None
 
 
@@ -12990,7 +12996,7 @@ class Run:
 
 
 class PyprojectCli(ArgparseCli):
-    _docker_container = argparse_arg('--_docker_container', help=argparse.SUPPRESS)
+    _current_docker_service = argparse_arg('--_current_docker_service', help=argparse.SUPPRESS)
 
     @argparse_cmd(
         argparse_arg('name'),
@@ -13000,11 +13006,11 @@ class PyprojectCli(ArgparseCli):
     )
     async def venv(self) -> None:
         venv = Run().venvs()[self.args.name]
-        if (sd := venv.cfg.docker) is not None and sd != (cd := self.args._docker_container):  # noqa
+        if (sd := venv.cfg.docker_service) is not None and sd != (cd := self.args._current_docker_service):  # noqa
             script = ' '.join([
                 'python3',
                 shlex.quote(_script_rel_path()),
-                f'--_docker_container={shlex.quote(sd)}',
+                f'--_current_docker_service={shlex.quote(sd)}',
                 *map(shlex.quote, sys.argv[1:]),
             ])
 

{omdev-0.0.0.dev541 → omdev-0.0.0.dev542}/omdev/tui/textual/__init__.py

@@ -81,6 +81,9 @@ with _lang.auto_proxy_init(globals()):
     from textual.content import ContentType  # noqa
     from textual.content import EMPTY_CONTENT  # noqa
     from textual.content import Span  # noqa
+    from textual.document._document import Document  # noqa
+    from textual.document._document import Location  # noqa
+    from textual.document._document import Selection  # noqa
     from textual.dom import DOMError  # noqa
     from textual.dom import DOMNode  # noqa
     from textual.driver import Driver  # noqa

{omdev-0.0.0.dev541 → omdev-0.0.0.dev542/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev541
+Version: 0.0.0.dev542
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev541
+Requires-Dist: omlish==0.0.0.dev542
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev541 → omdev-0.0.0.dev542}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev541
+omlish==0.0.0.dev542
 
 [all]
 black~=26.3

{omdev-0.0.0.dev541 → omdev-0.0.0.dev542}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev541'
+version = '0.0.0.dev542'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev541',
+    'omlish == 0.0.0.dev542',
 ]
 
 [project.optional-dependencies]