omdev 0.0.0.dev433__tar.gz → 0.0.0.dev435__tar.gz

{omdev-0.0.0.dev433/omdev.egg-info → omdev-0.0.0.dev435}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev433
+Version: 0.0.0.dev435
 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.dev433
+Requires-Dist: omlish==0.0.0.dev435
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"

{omdev-0.0.0.dev433 → omdev-0.0.0.dev435}/omdev/.omlish-manifests.json

@@ -368,7 +368,7 @@
     "module": ".tools.docker",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/docker.py",
-    "line": 259,
+    "line": 271,
     "value": {
       "!.cli.types.CliModule": {
         "name": "docker",

{omdev-0.0.0.dev433 → omdev-0.0.0.dev435}/omdev/packaging/specifiers.py

@@ -31,9 +31,9 @@ from .versions import Version
 from .versions import canonicalize_version
 
 
-UnparsedVersion = ta.Union['Version', str]
+UnparsedVersion = ta.Union['Version', str]  # ta.TypeAlias
 UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
-CallableVersionOperator = ta.Callable[['Version', str], bool]
+CallableVersionOperator = ta.Callable[['Version', str], bool]  # ta.TypeAlias
 
 
 ##

{omdev-0.0.0.dev433 → omdev-0.0.0.dev435}/omdev/packaging/versions.py

@@ -27,13 +27,13 @@ import re
 import typing as ta
 
 
-VersionLocalType = ta.Tuple[ta.Union[int, str], ...]
+VersionLocalType = ta.Tuple[ta.Union[int, str], ...]  # ta.TypeAlias
 
-VersionCmpPrePostDevType = ta.Union['InfinityVersionType', 'NegativeInfinityVersionType', ta.Tuple[str, int]]
-_VersionCmpLocalType0 = ta.Tuple[ta.Union[ta.Tuple[int, str], ta.Tuple['NegativeInfinityVersionType', ta.Union[int, str]]], ...]  # noqa
-VersionCmpLocalType = ta.Union['NegativeInfinityVersionType', _VersionCmpLocalType0]
-VersionCmpKey = ta.Tuple[int, ta.Tuple[int, ...], VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpLocalType]  # noqa
-VersionComparisonMethod = ta.Callable[[VersionCmpKey, VersionCmpKey], bool]
+VersionCmpPrePostDevType = ta.Union['InfinityVersionType', 'NegativeInfinityVersionType', ta.Tuple[str, int]]  # ta.TypeAlias  # noqa
+_VersionCmpLocalType0 = ta.Tuple[ta.Union[ta.Tuple[int, str], ta.Tuple['NegativeInfinityVersionType', ta.Union[int, str]]], ...]  # ta.TypeAlias  # noqa
+VersionCmpLocalType = ta.Union['NegativeInfinityVersionType', _VersionCmpLocalType0]  # ta.TypeAlias
+VersionCmpKey = ta.Tuple[int, ta.Tuple[int, ...], VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpLocalType]  # ta.TypeAlias  # noqa
+VersionComparisonMethod = ta.Callable[[VersionCmpKey, VersionCmpKey], bool]  # ta.TypeAlias
 
 
 ##

{omdev-0.0.0.dev433 → omdev-0.0.0.dev435}/omdev/py/tools/importscan.py

@@ -23,8 +23,8 @@ import sys
 import typing as ta
 
 from omlish import check
-from omlish import concurrent as cu
 from omlish import lang
+from omlish.concurrent import all as conc
 
 from ...cli import CliModule
 
@@ -163,7 +163,7 @@ def run(
         specs.append(spec)
 
     out: dict[str, Item] = {}
-    with cu.new_executor(num_threads) as ex:
+    with conc.new_executor(num_threads) as ex:
         futs = [ex.submit(run_one, spec, **kwargs) for spec in specs]
         for fut in futs:
             item = fut.result()

{omdev-0.0.0.dev433 → omdev-0.0.0.dev435}/omdev/scripts/ci.py

@@ -108,7 +108,7 @@ AsyncExitStackedT = ta.TypeVar('AsyncExitStackedT', bound='AsyncExitStacked')
 LogLevel = int  # ta.TypeAlias
 
 # ../../omlish/sockets/addresses.py
-SocketAddress = ta.Any
+SocketAddress = ta.Any  # ta.TypeAlias
 
 # github/api/v2/api.py
 GithubCacheServiceV2RequestT = ta.TypeVar('GithubCacheServiceV2RequestT')
@@ -150,10 +150,10 @@ HttpHandler = ta.Callable[['HttpHandlerRequest'], 'HttpHandlerResponse']  # ta.T
 HttpHandlerResponseData = ta.Union[bytes, 'HttpHandlerResponseStreamedData']  # ta.TypeAlias  # noqa
 
 # ../../omlish/lite/inject.py
-InjectorKeyCls = ta.Union[type, ta.NewType]
-InjectorProviderFn = ta.Callable[['Injector'], ta.Any]
-InjectorProviderFnMap = ta.Mapping['InjectorKey', 'InjectorProviderFn']
-InjectorBindingOrBindings = ta.Union['InjectorBinding', 'InjectorBindings']
+InjectorKeyCls = ta.Union[type, ta.NewType]  # ta.TypeAlias
+InjectorProviderFn = ta.Callable[['Injector'], ta.Any]  # ta.TypeAlias
+InjectorProviderFnMap = ta.Mapping['InjectorKey', 'InjectorProviderFn']  # ta.TypeAlias
+InjectorBindingOrBindings = ta.Union['InjectorBinding', 'InjectorBindings']  # ta.TypeAlias
 
 # ../../omlish/logs/contexts.py
 LoggingContextInfoT = ta.TypeVar('LoggingContextInfoT', bound=LoggingContextInfo)
@@ -165,7 +165,7 @@ SocketServerHandler = ta.Callable[['SocketAndAddress'], None]  # ta.TypeAlias
 DataServerTargetT = ta.TypeVar('DataServerTargetT', bound='DataServerTarget')
 
 # ../../omlish/http/coro/server/server.py
-CoroHttpServerFactory = ta.Callable[[SocketAddress], 'CoroHttpServer']
+CoroHttpServerFactory = ta.Callable[[SocketAddress], 'CoroHttpServer']  # ta.TypeAlias
 
 # ../../omlish/subprocesses/base.py
 SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlias

{omdev-0.0.0.dev433 → omdev-0.0.0.dev435}/omdev/scripts/interp.py

@@ -53,12 +53,12 @@ if sys.version_info < (3, 8):
 
 
 # ../packaging/versions.py
-VersionLocalType = ta.Tuple[ta.Union[int, str], ...]
-VersionCmpPrePostDevType = ta.Union['InfinityVersionType', 'NegativeInfinityVersionType', ta.Tuple[str, int]]
-_VersionCmpLocalType0 = ta.Tuple[ta.Union[ta.Tuple[int, str], ta.Tuple['NegativeInfinityVersionType', ta.Union[int, str]]], ...]  # noqa
-VersionCmpLocalType = ta.Union['NegativeInfinityVersionType', _VersionCmpLocalType0]
-VersionCmpKey = ta.Tuple[int, ta.Tuple[int, ...], VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpLocalType]  # noqa
-VersionComparisonMethod = ta.Callable[[VersionCmpKey, VersionCmpKey], bool]
+VersionLocalType = ta.Tuple[ta.Union[int, str], ...]  # ta.TypeAlias
+VersionCmpPrePostDevType = ta.Union['InfinityVersionType', 'NegativeInfinityVersionType', ta.Tuple[str, int]]  # ta.TypeAlias  # noqa
+_VersionCmpLocalType0 = ta.Tuple[ta.Union[ta.Tuple[int, str], ta.Tuple['NegativeInfinityVersionType', ta.Union[int, str]]], ...]  # ta.TypeAlias  # noqa
+VersionCmpLocalType = ta.Union['NegativeInfinityVersionType', _VersionCmpLocalType0]  # ta.TypeAlias
+VersionCmpKey = ta.Tuple[int, ta.Tuple[int, ...], VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpLocalType]  # ta.TypeAlias  # noqa
+VersionComparisonMethod = ta.Callable[[VersionCmpKey, VersionCmpKey], bool]  # ta.TypeAlias
 
 # ../../omlish/lite/cached.py
 T = ta.TypeVar('T')
@@ -76,9 +76,9 @@ CheckArgsRenderer = ta.Callable[..., ta.Optional[str]]  # ta.TypeAlias
 LogLevel = int  # ta.TypeAlias
 
 # ../packaging/specifiers.py
-UnparsedVersion = ta.Union['Version', str]
+UnparsedVersion = ta.Union['Version', str]  # ta.TypeAlias
 UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
-CallableVersionOperator = ta.Callable[['Version', str], bool]
+CallableVersionOperator = ta.Callable[['Version', str], bool]  # ta.TypeAlias
 
 # ../../omlish/argparse/cli.py
 ArgparseCmdFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
@@ -93,10 +93,10 @@ TimeoutLike = ta.Union['Timeout', ta.Type['Timeout.DEFAULT'], ta.Iterable['Timeo
 AwaitableT = ta.TypeVar('AwaitableT', bound=ta.Awaitable)
 
 # ../../omlish/lite/inject.py
-InjectorKeyCls = ta.Union[type, ta.NewType]
-InjectorProviderFn = ta.Callable[['Injector'], ta.Any]
-InjectorProviderFnMap = ta.Mapping['InjectorKey', 'InjectorProviderFn']
-InjectorBindingOrBindings = ta.Union['InjectorBinding', 'InjectorBindings']
+InjectorKeyCls = ta.Union[type, ta.NewType]  # ta.TypeAlias
+InjectorProviderFn = ta.Callable[['Injector'], ta.Any]  # ta.TypeAlias
+InjectorProviderFnMap = ta.Mapping['InjectorKey', 'InjectorProviderFn']  # ta.TypeAlias
+InjectorBindingOrBindings = ta.Union['InjectorBinding', 'InjectorBindings']  # ta.TypeAlias
 
 # ../../omlish/subprocesses/base.py
 SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlias

{omdev-0.0.0.dev433 → omdev-0.0.0.dev435}/omdev/scripts/pyproject.py

@@ -84,12 +84,12 @@ if sys.version_info < (3, 8):
 
 
 # ../packaging/versions.py
-VersionLocalType = ta.Tuple[ta.Union[int, str], ...]
-VersionCmpPrePostDevType = ta.Union['InfinityVersionType', 'NegativeInfinityVersionType', ta.Tuple[str, int]]
-_VersionCmpLocalType0 = ta.Tuple[ta.Union[ta.Tuple[int, str], ta.Tuple['NegativeInfinityVersionType', ta.Union[int, str]]], ...]  # noqa
-VersionCmpLocalType = ta.Union['NegativeInfinityVersionType', _VersionCmpLocalType0]
-VersionCmpKey = ta.Tuple[int, ta.Tuple[int, ...], VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpLocalType]  # noqa
-VersionComparisonMethod = ta.Callable[[VersionCmpKey, VersionCmpKey], bool]
+VersionLocalType = ta.Tuple[ta.Union[int, str], ...]  # ta.TypeAlias
+VersionCmpPrePostDevType = ta.Union['InfinityVersionType', 'NegativeInfinityVersionType', ta.Tuple[str, int]]  # ta.TypeAlias  # noqa
+_VersionCmpLocalType0 = ta.Tuple[ta.Union[ta.Tuple[int, str], ta.Tuple['NegativeInfinityVersionType', ta.Union[int, str]]], ...]  # ta.TypeAlias  # noqa
+VersionCmpLocalType = ta.Union['NegativeInfinityVersionType', _VersionCmpLocalType0]  # ta.TypeAlias
+VersionCmpKey = ta.Tuple[int, ta.Tuple[int, ...], VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpLocalType]  # ta.TypeAlias  # noqa
+VersionComparisonMethod = ta.Callable[[VersionCmpKey, VersionCmpKey], bool]  # ta.TypeAlias
 
 # ../../omlish/formats/toml/parser.py
 TomlParseFloat = ta.Callable[[str], ta.Any]  # ta.TypeAlias
@@ -117,9 +117,9 @@ A2 = ta.TypeVar('A2')
 LogLevel = int  # ta.TypeAlias
 
 # ../packaging/specifiers.py
-UnparsedVersion = ta.Union['Version', str]
+UnparsedVersion = ta.Union['Version', str]  # ta.TypeAlias
 UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
-CallableVersionOperator = ta.Callable[['Version', str], bool]
+CallableVersionOperator = ta.Callable[['Version', str], bool]  # ta.TypeAlias
 
 # ../../omlish/argparse/cli.py
 ArgparseCmdFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
@@ -141,10 +141,10 @@ LoggingContextInfo = ta.Any  # ta.TypeAlias
 AwaitableT = ta.TypeVar('AwaitableT', bound=ta.Awaitable)
 
 # ../../omlish/lite/inject.py
-InjectorKeyCls = ta.Union[type, ta.NewType]
-InjectorProviderFn = ta.Callable[['Injector'], ta.Any]
-InjectorProviderFnMap = ta.Mapping['InjectorKey', 'InjectorProviderFn']
-InjectorBindingOrBindings = ta.Union['InjectorBinding', 'InjectorBindings']
+InjectorKeyCls = ta.Union[type, ta.NewType]  # ta.TypeAlias
+InjectorProviderFn = ta.Callable[['Injector'], ta.Any]  # ta.TypeAlias
+InjectorProviderFnMap = ta.Mapping['InjectorKey', 'InjectorProviderFn']  # ta.TypeAlias
+InjectorBindingOrBindings = ta.Union['InjectorBinding', 'InjectorBindings']  # ta.TypeAlias
 
 # ../../omlish/logs/contexts.py
 LoggingContextInfoT = ta.TypeVar('LoggingContextInfoT', bound=LoggingContextInfo)

{omdev-0.0.0.dev433 → omdev-0.0.0.dev435}/omdev/tools/docker.py

@@ -13,12 +13,14 @@ import re
 import shutil
 import subprocess
 import sys
+import threading
 import typing as ta
 
 from omlish import check
 from omlish import lang
 from omlish import marshal as msh
 from omlish.argparse import all as ap
+from omlish.concurrent import all as conc
 from omlish.docker import all as dck
 from omlish.docker.ns1 import build_docker_ns1_run_cmd
 from omlish.formats import json
@@ -204,6 +206,7 @@ class Cli(ap.Cli):
 
     @ap.cmd(
         ap.arg('-f', '--file'),
+        ap.arg('-p', '--parallelism', type=int, default=4),
     )
     def compose_image_updates(self) -> None:
         if self.args.file:
@@ -215,23 +218,32 @@ class Cli(ap.Cli):
             yml_src = f.read()
 
         cfg_dct = yaml.safe_load(yml_src)
-        for svc_name, svc_dct in cfg_dct.get('services', {}).items():
-            if not (img := svc_dct.get('image')):
-                continue
 
+        print_lock = threading.Lock()
+
+        def do_svc(svc_name: str, img: str) -> None:  # noqa
             repo, _, base = img.partition(':')
             try:
                 if (info := dck.get_hub_repo_info(repo)) is None:
-                    continue
+                    return
 
                 lt = dck.select_latest_tag(info.tags, base=base)
                 if f'{repo}:{lt}' == img:
-                    continue
+                    return
 
-                print(f'{svc_name}: {lt}')
+                with print_lock:
+                    print(f'{svc_name}: {lt}')
 
             except Exception as e:  # noqa
-                print(f'Error checking docker update for {svc_name}: {e!r}', file=sys.stderr)
+                with print_lock:
+                    print(f'Error checking docker update for {svc_name}: {e!r}', file=sys.stderr)
+
+        with conc.new_executor(self.args.parallelism) as exe:
+            conc.wait_futures([
+                exe.submit(do_svc, svc_name, img)
+                for svc_name, svc_dct in cfg_dct.get('services', {}).items()
+                if (img := svc_dct.get('image'))
+            ])
 
     #
 

{omdev-0.0.0.dev433 → omdev-0.0.0.dev435/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev433
+Version: 0.0.0.dev435
 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.dev433
+Requires-Dist: omlish==0.0.0.dev435
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"

{omdev-0.0.0.dev433 → omdev-0.0.0.dev435}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev433
+omlish==0.0.0.dev435
 
 [all]
 black~=25.1

{omdev-0.0.0.dev433 → omdev-0.0.0.dev435}/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.dev433'
+version = '0.0.0.dev435'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev433',
+    'omlish == 0.0.0.dev435',
 ]
 
 [project.optional-dependencies]