omdev 0.0.0.dev355__py3-none-any.whl → 0.0.0.dev357__py3-none-any.whl

omdev/.manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 186,
+    "line": 193,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",

omdev/ci/docker/dataserver.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 import asyncio
 import contextlib
 import logging

omdev/ci/docker/repositories.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 import abc
 import contextlib
 import shlex

omdev/cli/clicli.py

@@ -91,11 +91,17 @@ class CliCli(ap.Cli):
         ap.arg('--local', action='store_true'),
         ap.arg('--no-deps', action='store_true'),
         ap.arg('--dry-run', action='store_true'),
+        ap.arg('--version'),
         ap.arg('extra_deps', nargs='*'),
     )
     def reinstall(self) -> None:
         latest_version = _parse_latest_version_str(lookup_latest_package_version(__package__.split('.')[0]))
 
+        if self.args.version is not None:
+            target_version: str = self.args.version
+        else:
+            target_version = latest_version
+
         #
 
         dep_set: set[str] = set(self.args.extra_deps or [])
@@ -142,6 +148,7 @@ class CliCli(ap.Cli):
 
         print(f'Current version: {__about__.__version__}')
         print(f'Latest version: {latest_version}')
+        print(f'Target version: {target_version}')
         print()
 
         #
@@ -163,7 +170,7 @@ class CliCli(ap.Cli):
             reco_cmd = ' '.join([
                 'curl -LsSf',
                 f"'{url}'" if (qu := shlex.quote(url)) == url else qu,
-                f'| python3 - --version {shlex.quote(latest_version)}',
+                f'| python3 - --version {shlex.quote(target_version)}',
                 *deps,
             ])
             print(f'Recovery command:\n\n{reco_cmd}\n')
@@ -178,7 +185,7 @@ class CliCli(ap.Cli):
             sys.executable,
             sys.executable,
             '-c', install_src,
-            '--version', latest_version,
+            '--version', target_version,
             *deps,
         )
 

omdev/interp/cli.py

@@ -25,6 +25,9 @@ from .resolvers import InterpResolverProviders
 from .types import InterpSpecifier
 
 
+##
+
+
 class InterpCli(ArgparseCli):
     @cached_nullary
     def injector(self) -> Injector:

omdev/interp/default.py

@@ -5,6 +5,9 @@ from .inject import bind_interp
 from .resolvers import InterpResolver
 
 
+##
+
+
 @cached_nullary
 def get_default_interp_resolver() -> InterpResolver:
     return inj.create_injector(bind_interp())[InterpResolver]

omdev/interp/inject.py

@@ -15,6 +15,10 @@ from .pyenv.provider import PyenvInterpProvider
 from .resolvers import InterpResolver
 from .resolvers import InterpResolverProviders
 from .uv.inject import bind_interp_uv
+from .uv.provider import UvInterpProvider
+
+
+##
 
 
 def bind_interp() -> InjectorBindings:
@@ -36,6 +40,7 @@ def bind_interp() -> InjectorBindings:
             injector.provide(c)
             for c in [
                 PyenvInterpProvider,
+                UvInterpProvider,
                 RunningInterpProvider,
                 SystemInterpProvider,
             ]

omdev/interp/inspect.py

@@ -12,6 +12,9 @@ from .types import InterpOpts
 from .types import InterpVersion
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class InterpInspection:
     exe: str

omdev/interp/providers/inject.py

@@ -11,6 +11,9 @@ from .running import RunningInterpProvider
 from .system import SystemInterpProvider
 
 
+##
+
+
 def bind_interp_providers() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind_array(InterpProvider),

omdev/interp/providers/running.py

@@ -10,6 +10,9 @@ from ..types import InterpVersion
 from .base import InterpProvider
 
 
+##
+
+
 class RunningInterpProvider(InterpProvider):
     @cached_nullary
     def version(self) -> InterpVersion:

omdev/interp/providers/standalone.py

@@ -36,6 +36,9 @@ from omlish.lite.check import check
 from omlish.lite.logs import log
 
 
+##
+
+
 class StandalonePythons:
     LAST_TAG_FOR_I686_LINUX = '118809599'  # tag name: "20230826"
 

omdev/interp/pyenv/inject.py

@@ -10,6 +10,9 @@ from .provider import PyenvInterpProvider
 from .pyenv import Pyenv
 
 
+##
+
+
 def bind_interp_pyenv() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind(Pyenv, singleton=True),

omdev/interp/pyenv/provider.py

@@ -17,6 +17,9 @@ from .install import PyenvVersionInstaller
 from .pyenv import Pyenv
 
 
+##
+
+
 class PyenvInterpProvider(InterpProvider):
     @dc.dataclass(frozen=True)
     class Options:

omdev/interp/pyenv/pyenv.py

@@ -19,6 +19,9 @@ from omlish.lite.cached import async_cached_nullary
 from omlish.lite.check import check
 
 
+##
+
+
 class Pyenv:
     def __init__(
             self,

omdev/interp/resolvers.py

@@ -9,6 +9,9 @@ from .types import InterpSpecifier
 from .types import InterpVersion
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class InterpResolverProviders:
     providers: ta.Sequence[ta.Tuple[str, InterpProvider]]

omdev/interp/uv/inject.py

@@ -5,8 +5,20 @@ from omlish.lite.inject import InjectorBindingOrBindings
 from omlish.lite.inject import InjectorBindings
 from omlish.lite.inject import inj
 
+from ..providers.base import InterpProvider
+from .provider import UvInterpProvider
+from .uv import Uv
+
+
+##
+
 
 def bind_interp_uv() -> InjectorBindings:
-    lst: ta.List[InjectorBindingOrBindings] = []
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind(Uv, singleton=True),
+
+        inj.bind(UvInterpProvider, singleton=True),
+        inj.bind(InterpProvider, to_key=UvInterpProvider, array=True),
+    ]
 
     return inj.as_bindings(*lst)

omdev/interp/uv/provider.py

@@ -5,17 +5,36 @@ uv run --python 3.11.6 pip
 uv venv --python 3.11.6 --seed barf
 python3 -m venv barf && barf/bin/pip install uv && barf/bin/uv venv --python 3.11.6 --seed barf2
 """
+import logging
 import typing as ta
 
+from ..inspect import InterpInspector
 from ..providers.base import InterpProvider
 from ..types import Interp
 from ..types import InterpSpecifier
 from ..types import InterpVersion
+from .uv import Uv
+
+
+##
 
 
 class UvInterpProvider(InterpProvider):
-    def get_installed_versions(self, spec: InterpSpecifier) -> ta.Awaitable[ta.Sequence[InterpVersion]]:
-        raise NotImplementedError
+    def __init__(
+            self,
+            *,
+            pyenv: Uv,
+            inspector: InterpInspector,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
+        super().__init__()
+
+        self._pyenv = pyenv
+        self._inspector = inspector
+        self._log = log
+
+    async def get_installed_versions(self, spec: InterpSpecifier) -> ta.Sequence[InterpVersion]:
+        return []
 
-    def get_installed_version(self, version: InterpVersion) -> ta.Awaitable[Interp]:
+    async def get_installed_version(self, version: InterpVersion) -> Interp:
         raise NotImplementedError

omdev/interp/uv/uv.py

@@ -12,6 +12,9 @@ from omlish.lite.cached import async_cached_nullary
 from omlish.lite.check import check
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class UvConfig:
     ignore_path: bool = False

omdev/magic/magic.py

@@ -3,6 +3,9 @@ import dataclasses as dc
 import typing as ta
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class Magic:
     key: str

omdev/magic/prepare.py

@@ -2,6 +2,9 @@ import json
 import typing as ta
 
 
+##
+
+
 class MagicPrepareError(Exception):
     pass
 

omdev/magic/styles.py

@@ -3,6 +3,9 @@ import dataclasses as dc
 import typing as ta
 
 
+##
+
+
 MAGIC_KEY_PREFIX = '@omlish-'
 
 

omdev/precheck/git.py

@@ -25,7 +25,7 @@ class GitBlacklistPrecheck(Precheck['GitBlacklistPrecheck.Config']):
     def __init__(self, config: Config = Config()) -> None:
         super().__init__(config)
 
-    async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
+    async def run(self) -> ta.AsyncGenerator[Precheck.Violation]:
         for f in self._config.files:
             proc = await asyncio.create_subprocess_exec('git', 'status', '-s', f)
             await proc.communicate()

omdev/precheck/imports.py

@@ -35,7 +35,7 @@ class RootRelativeImportPrecheck(Precheck['RootRelativeImportPrecheck.Config']):
         self._headers_cache = headers_cache
         self._ast_cache = ast_cache
 
-    async def _run_py_file(self, py_file: str, src_root: str) -> ta.AsyncGenerator[Precheck.Violation, None]:
+    async def _run_py_file(self, py_file: str, src_root: str) -> ta.AsyncGenerator[Precheck.Violation]:
         if isinstance(header_lines := self._headers_cache.get_file_headers(py_file), Exception):
             return
         if any(hl.src.strip() == '# ruff: noqa' for hl in header_lines):
@@ -58,7 +58,7 @@ class RootRelativeImportPrecheck(Precheck['RootRelativeImportPrecheck.Config']):
 
         return
 
-    async def _run_src_root(self, src_root: str) -> ta.AsyncGenerator[Precheck.Violation, None]:
+    async def _run_src_root(self, src_root: str) -> ta.AsyncGenerator[Precheck.Violation]:
         py_files = [
             os.path.join(e.root, f)
             for e in self._dir_walk_cache.list_dir(src_root)
@@ -70,7 +70,7 @@ class RootRelativeImportPrecheck(Precheck['RootRelativeImportPrecheck.Config']):
             async for v in self._run_py_file(py_file, src_root):
                 yield v
 
-    async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
+    async def run(self) -> ta.AsyncGenerator[Precheck.Violation]:
         for src_root in self._context.src_roots:
             async for v in self._run_src_root(src_root):
                 yield v

omdev/precheck/lite.py

@@ -157,7 +157,7 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
         else:
             raise RuntimeError(f'Unknown target kind: {tgt.kind}')
 
-    async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
+    async def run(self) -> ta.AsyncGenerator[Precheck.Violation]:
         tgts = await self._collect_targets()
 
         sem = asyncio.Semaphore(self._config.concurrency)

omdev/precheck/manifests.py

@@ -20,7 +20,7 @@ class ManifestsPrecheck(Precheck['ManifestsPrecheck.Config']):
 
         self._context = context
 
-    async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
+    async def run(self) -> ta.AsyncGenerator[Precheck.Violation]:
         for src_root in self._context.src_roots:
             try:
                 MANIFEST_LOADER.load(src_root)

omdev/precheck/scripts.py

@@ -26,7 +26,7 @@ class ScriptDepsPrecheck(Precheck['ScriptDepsPrecheck.Config']):
 
         self._context = context
 
-    async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
+    async def run(self) -> ta.AsyncGenerator[Precheck.Violation]:
         for fp in magic.find_magic_files(
                 magic.PY_MAGIC_STYLE,
                 self._context.src_roots,

omdev/scripts/ci.py

@@ -5,7 +5,7 @@
 # @omlish-generated
 # @omlish-amalg-output ../ci/cli.py
 # @omlish-git-diff-omit
-# ruff: noqa: N802 TC003 UP006 UP007 UP036 UP045
+# ruff: noqa: N802 TC003 UP006 UP007 UP036 UP043 UP045
 """
 Inputs:
  - requirements.txt

omdev/scripts/interp.py

@@ -5,7 +5,7 @@
 # @omlish-generated
 # @omlish-amalg-output ../interp/cli.py
 # @omlish-git-diff-omit
-# ruff: noqa: N802 UP006 UP007 UP036 UP045
+# ruff: noqa: N802 UP006 UP007 UP036 UP043 UP045
 """
 TODO:
  - partial best-matches - '3.12'
@@ -34,6 +34,7 @@ import shlex
 import shutil
 import subprocess
 import sys
+import tempfile
 import threading
 import time
 import types
@@ -4020,16 +4021,6 @@ class Interp:
     version: InterpVersion
 
 
-########################################
-# ../uv/inject.py
-
-
-def bind_interp_uv() -> InjectorBindings:
-    lst: ta.List[InjectorBindingOrBindings] = []
-
-    return inj.as_bindings(*lst)
-
-
 ########################################
 # ../../../omlish/logs/standard.py
 """
@@ -4435,6 +4426,9 @@ class BaseSubprocesses(abc.ABC):  # noqa
 # ../resolvers.py
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class InterpResolverProviders:
     providers: ta.Sequence[ta.Tuple[str, InterpProvider]]
@@ -4829,6 +4823,9 @@ asyncio_subprocesses = AsyncioSubprocesses()
 # ../inspect.py
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class InterpInspection:
     exe: str
@@ -4938,6 +4935,9 @@ TODO:
 """
 
 
+##
+
+
 class Pyenv:
     def __init__(
             self,
@@ -5005,10 +5005,74 @@ class Pyenv:
         return True
 
 
+########################################
+# ../uv/uv.py
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class UvConfig:
+    ignore_path: bool = False
+    pip_bootstrap: bool = True
+
+
+class Uv:
+    def __init__(
+            self,
+            config: UvConfig = UvConfig(),
+            *,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
+        super().__init__()
+
+        self._config = config
+        self._log = log
+
+        self._bootstrap_dir: ta.Optional[str] = None
+
+    def delete_bootstrap_dir(self) -> bool:
+        if (bs := self._bootstrap_dir) is None:
+            return False
+
+        shutil.rmtree(bs)
+        self._bootstrap_dir = None
+        return True
+
+    @async_cached_nullary
+    async def uv_exe(self) -> ta.Optional[str]:
+        if not self._config.ignore_path and (uv := shutil.which('uv')):
+            return uv
+
+        if self._config.pip_bootstrap:
+            if (bd := self._bootstrap_dir) is None:
+                bd = self._bootstrap_dir = tempfile.mkdtemp()
+
+            if self._log is not None:
+                self._log.info(f'Bootstrapping uv into %s', bd)
+
+            vn = 'uv-bootstrap'
+            await asyncio_subprocesses.check_call(os.path.realpath(sys.executable), '-m', 'venv', vn, cwd=bd)
+
+            vx = os.path.join(bd, vn, 'bin', 'python3')
+            await asyncio_subprocesses.check_call(vx, '-m', 'pip', 'install', 'uv', cwd=bd)
+
+            ux = os.path.join(bd, vn, 'bin', 'uv')
+            check.state(os.path.isfile(ux))
+
+            return ux
+
+        return None
+
+
 ########################################
 # ../providers/running.py
 
 
+##
+
+
 class RunningInterpProvider(InterpProvider):
     @cached_nullary
     def version(self) -> InterpVersion:
@@ -5415,10 +5479,47 @@ class PyenvVersionInstaller:
         return exe
 
 
+########################################
+# ../uv/provider.py
+"""
+uv run pip
+uv run --python 3.11.6 pip
+uv venv --python 3.11.6 --seed barf
+python3 -m venv barf && barf/bin/pip install uv && barf/bin/uv venv --python 3.11.6 --seed barf2
+"""
+
+
+##
+
+
+class UvInterpProvider(InterpProvider):
+    def __init__(
+            self,
+            *,
+            pyenv: Uv,
+            inspector: InterpInspector,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
+        super().__init__()
+
+        self._pyenv = pyenv
+        self._inspector = inspector
+        self._log = log
+
+    async def get_installed_versions(self, spec: InterpSpecifier) -> ta.Sequence[InterpVersion]:
+        return []
+
+    async def get_installed_version(self, version: InterpVersion) -> Interp:
+        raise NotImplementedError
+
+
 ########################################
 # ../providers/inject.py
 
 
+##
+
+
 def bind_interp_providers() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind_array(InterpProvider),
@@ -5438,6 +5539,9 @@ def bind_interp_providers() -> InjectorBindings:
 # ../pyenv/provider.py
 
 
+##
+
+
 class PyenvInterpProvider(InterpProvider):
     @dc.dataclass(frozen=True)
     class Options:
@@ -5565,10 +5669,31 @@ class PyenvInterpProvider(InterpProvider):
         return Interp(exe, version)
 
 
+########################################
+# ../uv/inject.py
+
+
+##
+
+
+def bind_interp_uv() -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind(Uv, singleton=True),
+
+        inj.bind(UvInterpProvider, singleton=True),
+        inj.bind(InterpProvider, to_key=UvInterpProvider, array=True),
+    ]
+
+    return inj.as_bindings(*lst)
+
+
 ########################################
 # ../pyenv/inject.py
 
 
+##
+
+
 def bind_interp_pyenv() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind(Pyenv, singleton=True),
@@ -5584,6 +5709,9 @@ def bind_interp_pyenv() -> InjectorBindings:
 # ../inject.py
 
 
+##
+
+
 def bind_interp() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         bind_interp_providers(),
@@ -5603,6 +5731,7 @@ def bind_interp() -> InjectorBindings:
             injector.provide(c)
             for c in [
                 PyenvInterpProvider,
+                UvInterpProvider,
                 RunningInterpProvider,
                 SystemInterpProvider,
             ]
@@ -5625,6 +5754,9 @@ def bind_interp() -> InjectorBindings:
 # cli.py
 
 
+##
+
+
 class InterpCli(ArgparseCli):
     @cached_nullary
     def injector(self) -> Injector:

omdev/scripts/pyproject.py

@@ -5,7 +5,7 @@
 # @omlish-generated
 # @omlish-amalg-output ../pyproject/cli.py
 # @omlish-git-diff-omit
-# ruff: noqa: N802 TC003 UP006 UP007 UP036 UP045
+# ruff: noqa: N802 TC003 UP006 UP007 UP036 UP043 UP045
 """
 TODO:
  - check / tests, src dir sets
@@ -143,6 +143,9 @@ SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlia
 # ../../magic/magic.py
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class Magic:
     key: str
@@ -161,6 +164,9 @@ class Magic:
 # ../../magic/prepare.py
 
 
+##
+
+
 class MagicPrepareError(Exception):
     pass
 
@@ -190,6 +196,9 @@ def json_magic_preparer(src: str) -> ta.Any:
 # ../../magic/styles.py
 
 
+##
+
+
 MAGIC_KEY_PREFIX = '@omlish-'
 
 
@@ -6390,16 +6399,6 @@ class Interp:
     version: InterpVersion
 
 
-########################################
-# ../../interp/uv/inject.py
-
-
-def bind_interp_uv() -> InjectorBindings:
-    lst: ta.List[InjectorBindingOrBindings] = []
-
-    return inj.as_bindings(*lst)
-
-
 ########################################
 # ../../../omlish/logs/standard.py
 """
@@ -6805,6 +6804,9 @@ class BaseSubprocesses(abc.ABC):  # noqa
 # ../../interp/resolvers.py
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class InterpResolverProviders:
     providers: ta.Sequence[ta.Tuple[str, InterpProvider]]
@@ -7391,6 +7393,9 @@ asyncio_subprocesses = AsyncioSubprocesses()
 # ../../interp/inspect.py
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class InterpInspection:
     exe: str
@@ -7500,6 +7505,9 @@ TODO:
 """
 
 
+##
+
+
 class Pyenv:
     def __init__(
             self,
@@ -7567,6 +7575,67 @@ class Pyenv:
         return True
 
 
+########################################
+# ../../interp/uv/uv.py
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class UvConfig:
+    ignore_path: bool = False
+    pip_bootstrap: bool = True
+
+
+class Uv:
+    def __init__(
+            self,
+            config: UvConfig = UvConfig(),
+            *,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
+        super().__init__()
+
+        self._config = config
+        self._log = log
+
+        self._bootstrap_dir: ta.Optional[str] = None
+
+    def delete_bootstrap_dir(self) -> bool:
+        if (bs := self._bootstrap_dir) is None:
+            return False
+
+        shutil.rmtree(bs)
+        self._bootstrap_dir = None
+        return True
+
+    @async_cached_nullary
+    async def uv_exe(self) -> ta.Optional[str]:
+        if not self._config.ignore_path and (uv := shutil.which('uv')):
+            return uv
+
+        if self._config.pip_bootstrap:
+            if (bd := self._bootstrap_dir) is None:
+                bd = self._bootstrap_dir = tempfile.mkdtemp()
+
+            if self._log is not None:
+                self._log.info(f'Bootstrapping uv into %s', bd)
+
+            vn = 'uv-bootstrap'
+            await asyncio_subprocesses.check_call(os.path.realpath(sys.executable), '-m', 'venv', vn, cwd=bd)
+
+            vx = os.path.join(bd, vn, 'bin', 'python3')
+            await asyncio_subprocesses.check_call(vx, '-m', 'pip', 'install', 'uv', cwd=bd)
+
+            ux = os.path.join(bd, vn, 'bin', 'uv')
+            check.state(os.path.isfile(ux))
+
+            return ux
+
+        return None
+
+
 ########################################
 # ../../packaging/revisions.py
 """
@@ -7691,6 +7760,9 @@ class GitRevisionAdder:
 # ../../interp/providers/running.py
 
 
+##
+
+
 class RunningInterpProvider(InterpProvider):
     @cached_nullary
     def version(self) -> InterpVersion:
@@ -8097,6 +8169,40 @@ class PyenvVersionInstaller:
         return exe
 
 
+########################################
+# ../../interp/uv/provider.py
+"""
+uv run pip
+uv run --python 3.11.6 pip
+uv venv --python 3.11.6 --seed barf
+python3 -m venv barf && barf/bin/pip install uv && barf/bin/uv venv --python 3.11.6 --seed barf2
+"""
+
+
+##
+
+
+class UvInterpProvider(InterpProvider):
+    def __init__(
+            self,
+            *,
+            pyenv: Uv,
+            inspector: InterpInspector,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
+        super().__init__()
+
+        self._pyenv = pyenv
+        self._inspector = inspector
+        self._log = log
+
+    async def get_installed_versions(self, spec: InterpSpecifier) -> ta.Sequence[InterpVersion]:
+        return []
+
+    async def get_installed_version(self, version: InterpVersion) -> Interp:
+        raise NotImplementedError
+
+
 ########################################
 # ../pkg.py
 """
@@ -8659,6 +8765,9 @@ class _PyprojectCliPackageGenerator(BasePyprojectPackageGenerator):
 # ../../interp/providers/inject.py
 
 
+##
+
+
 def bind_interp_providers() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind_array(InterpProvider),
@@ -8678,6 +8787,9 @@ def bind_interp_providers() -> InjectorBindings:
 # ../../interp/pyenv/provider.py
 
 
+##
+
+
 class PyenvInterpProvider(InterpProvider):
     @dc.dataclass(frozen=True)
     class Options:
@@ -8805,10 +8917,31 @@ class PyenvInterpProvider(InterpProvider):
         return Interp(exe, version)
 
 
+########################################
+# ../../interp/uv/inject.py
+
+
+##
+
+
+def bind_interp_uv() -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind(Uv, singleton=True),
+
+        inj.bind(UvInterpProvider, singleton=True),
+        inj.bind(InterpProvider, to_key=UvInterpProvider, array=True),
+    ]
+
+    return inj.as_bindings(*lst)
+
+
 ########################################
 # ../../interp/pyenv/inject.py
 
 
+##
+
+
 def bind_interp_pyenv() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind(Pyenv, singleton=True),
@@ -8824,6 +8957,9 @@ def bind_interp_pyenv() -> InjectorBindings:
 # ../../interp/inject.py
 
 
+##
+
+
 def bind_interp() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         bind_interp_providers(),
@@ -8843,6 +8979,7 @@ def bind_interp() -> InjectorBindings:
             injector.provide(c)
             for c in [
                 PyenvInterpProvider,
+                UvInterpProvider,
                 RunningInterpProvider,
                 SystemInterpProvider,
             ]
@@ -8865,6 +9002,9 @@ def bind_interp() -> InjectorBindings:
 # ../../interp/default.py
 
 
+##
+
+
 @cached_nullary
 def get_default_interp_resolver() -> InterpResolver:
     return inj.create_injector(bind_interp())[InterpResolver]

omdev/tools/json/cli.py

@@ -1,7 +1,6 @@
 """
 TODO:
  - read from http
- - jmespath output flat, unquoted strs like jq '.[]'
 
 ==
 
@@ -68,10 +67,14 @@ T = ta.TypeVar('T')
 U = ta.TypeVar('U')
 
 
+##
+
+
 def _build_args_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser()
 
     parser.add_argument('file', nargs='?')
+    parser.add_argument('--source')
 
     parser.add_argument('-S', '--stream', action='store_true')
     parser.add_argument('-B', '--stream-build', action='store_true')
@@ -83,6 +86,7 @@ def _build_args_parser() -> argparse.ArgumentParser:
     parser.add_argument('-f', '--format')
 
     parser.add_argument('-x', '--jmespath-expr')
+    parser.add_argument('-M', '--marshal', action='store_true')
     parser.add_argument('-F', '--flat', action='store_true')
     parser.add_argument('-E', '--omit-empty', action='store_true')
 
@@ -129,6 +133,7 @@ def _process_args(args: ta.Any) -> RunConfiguration:
 
     processing = ProcessingOptions(
         jmespath_expr=args.jmespath_expr,
+        marshal=args.marshal,
         flat=args.flat,
         omit_empty=args.omit_empty,
     )
@@ -177,13 +182,16 @@ def _main() -> None:
     #
 
     with contextlib.ExitStack() as es:
-        if args.file is None:
+        in_file: ta.BinaryIO
+        if args.source is not None:
+            check.none(args.file)
+            in_file = io.BytesIO(args.source.encode('utf-8'))
+        elif args.file is None:
             in_file = sys.stdin.buffer
-
         else:
             in_file = es.enter_context(open(args.file, 'rb'))
 
-        def yield_input() -> ta.Generator[bytes, None, None]:
+        def yield_input() -> ta.Generator[bytes]:
             fd = check.isinstance(in_file.fileno(), int)
 
             while True:
@@ -228,7 +236,7 @@ def _main() -> None:
                 def flush_output(
                         fn: ta.Callable[[T], ta.Iterable[U]],
                         i: T,
-                ) -> ta.Generator[U, None, None]:
+                ) -> ta.Generator[U]:
                     n = 0
                     for o in fn(i):
                         yield o
@@ -247,7 +255,7 @@ def _main() -> None:
                     def append_newlines(
                             fn: ta.Callable[[T], ta.Iterable[str]],
                             i: T,
-                    ) -> ta.Generator[str, None, None]:
+                    ) -> ta.Generator[str]:
                         yield from fn(i)
                         yield '\n'
 

omdev/tools/json/parsing.py

@@ -22,7 +22,7 @@ class EagerParser:
 
         self._fmt = fmt
 
-    def parse(self, f: ta.TextIO) -> ta.Generator[ta.Any, None, None]:
+    def parse(self, f: ta.TextIO) -> ta.Generator[ta.Any]:
         return self._fmt.load(f)
 
 
@@ -42,7 +42,7 @@ class DelimitingParser:
 
         self._db = DelimitingBuffer(delimiters)
 
-    def parse(self, b: bytes) -> ta.Generator[ta.Any, None, None]:
+    def parse(self, b: bytes) -> ta.Generator[ta.Any]:
         for chunk in self._db.feed(b):
             s = check.isinstance(chunk, bytes).decode('utf-8')
             v = self._fmt.load(io.StringIO(s))
@@ -58,7 +58,7 @@ class StreamBuilder(lang.ExitStacked):
     def _enter_contexts(self) -> None:
         self._builder = self._enter_context(JsonObjectBuilder())
 
-    def build(self, e: JsonStreamParserEvent) -> ta.Generator[ta.Any, None, None]:
+    def build(self, e: JsonStreamParserEvent) -> ta.Generator[ta.Any]:
         yield from check.not_none(self._builder)(e)
 
 
@@ -72,7 +72,7 @@ class StreamParser(lang.ExitStacked):
         self._lex = self._enter_context(JsonStreamLexer())
         self._parse = self._enter_context(JsonStreamParser())
 
-    def parse(self, b: bytes) -> ta.Generator[JsonStreamParserEvent, None, None]:
+    def parse(self, b: bytes) -> ta.Generator[JsonStreamParserEvent]:
         for s in self._decoder.decode(b, not b):
             for c in s:
                 for t in self._lex(c):

omdev/tools/json/processing.py

@@ -5,8 +5,10 @@ from omlish import lang
 
 
 if ta.TYPE_CHECKING:
+    from omlish import marshal as msh
     from omlish.specs import jmespath
 else:
+    msh = lang.proxy_import('omlish.marshal')
     jmespath = lang.proxy_import('omlish.specs.jmespath')
 
 
@@ -16,6 +18,7 @@ else:
 @dc.dataclass(frozen=True, kw_only=True)
 class ProcessingOptions:
     jmespath_expr: ta.Any | None = None
+    marshal: bool = False
     flat: bool = False
     omit_empty: bool = False
 
@@ -31,10 +34,25 @@ class Processor:
             jmespath_expr = jmespath.compile(jmespath_expr)
         self._jmespath_expr: ta.Any | None = jmespath_expr
 
+    @lang.cached_function
+    def _marshaler_factory(self) -> 'msh.MarshalerFactory':
+        return msh.new_standard_marshaler_factory(
+            first=[msh.BASE64_MARSHALER_FACTORY],
+        )
+
+    def _marshal(self, v: ta.Any) -> ta.Any:
+        return msh.MarshalContext(
+            msh.GLOBAL_REGISTRY,
+            factory=self._marshaler_factory(),
+        ).marshal(v)
+
     def process(self, v: ta.Any) -> ta.Iterable[ta.Any]:
         if self._jmespath_expr is not None:
             v = self._jmespath_expr.search(v)
 
+        if self._opts.marshal:
+            v = self._marshal(v)
+
         vs: ta.Iterable[ta.Any]
         if self._opts.flat:
             if (

omdev/tools/json/rendering.py

@@ -98,5 +98,5 @@ class StreamRenderer(Renderer):
             **self._kw,
         )
 
-    def render(self, e: JsonStreamParserEvent) -> ta.Generator[str, None, None]:
+    def render(self, e: JsonStreamParserEvent) -> ta.Generator[str]:
         return self._renderer.render((e,))

{omdev-0.0.0.dev355.dist-info → omdev-0.0.0.dev357.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev355
+Version: 0.0.0.dev357
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev355
+Requires-Dist: omlish==0.0.0.dev357
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev355.dist-info → omdev-0.0.0.dev357.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=eThNbd6bCkCK4thijDHcXDZ2eDr6i-wfnmV_qxbzino,11870
+omdev/.manifests.json,sha256=bc0ButqJqOkZiEgO6VZ6CRZ8RL9Mf_DiFUNxm81jl04,11870
 omdev/__about__.py,sha256=2_6pQyjxqAspvwBSJUWQgdBBcGaDO3zX8yETLaspUQE,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
@@ -76,11 +76,11 @@ omdev/ci/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/ci/docker/buildcaching.py,sha256=ge6TOKkffqVJMHMPJJl4sWy7hOkUeXgjmfq2cVJEsus,1839
 omdev/ci/docker/cache.py,sha256=Psk9EX9iDJ2Fk-tDGzbBa4TD8xgucroGoY_AErjgzDo,2120
 omdev/ci/docker/cmds.py,sha256=1aSLQqbMJpdAMskxfeGI-he5Amb910RWvo2DE6ZgID8,3067
-omdev/ci/docker/dataserver.py,sha256=at4t24yUkWKmIGUib7joR4f7L-sSL1-soaYON7wbsf4,5867
+omdev/ci/docker/dataserver.py,sha256=3nDQhSJsEui3GG5vUqCND-n21EJJcMFKa7NO1Gkh_Go,5873
 omdev/ci/docker/imagepulling.py,sha256=6N8PkvZUlvd20kQ5zF0_7fInP6TYgZYFM9WsH9J7uIc,1832
 omdev/ci/docker/inject.py,sha256=vlWoIJHx2hzCai4wWspIcWnR3WhZ2bsOjq7fqq0qozE,2006
 omdev/ci/docker/packing.py,sha256=IayecomyP6AdaiKP1-Ki1wcb2ayfZz2mDqHWbPD8y50,2022
-omdev/ci/docker/repositories.py,sha256=R0IcY39oHwirfSuoIbaFF0NIc8qpcCJ9CWONvbf7kS8,1229
+omdev/ci/docker/repositories.py,sha256=kZx4mqKapT9L9LnanstUHaIgM68v35rcZLbMwhxg80c,1235
 omdev/ci/docker/utils.py,sha256=7Tobiq2hMxicGpQfTkDoU7oTa8Tyw47LpDh8C554LLs,1135
 omdev/ci/docker/cacheserved/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/ci/docker/cacheserved/cache.py,sha256=V9R1_HBNJzMGFqiSnTAP1M4VAv9pJBsXYvR7I52wR50,7025
@@ -103,7 +103,7 @@ omdev/ci/github/api/v2/client.py,sha256=bJtL_TZ4sB6IDuzfqtEXj-iWivKfyXQZ_MO30lgB
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=UshIZX3oeXq0De-9X28gy2LgKMZDf_dzabdkUhZJdNA,2124
-omdev/cli/clicli.py,sha256=KS6PMfqJmInQCi9dzpgKKFNQ9bO1jxlBbqypBgTZADU,4819
+omdev/cli/clicli.py,sha256=kJ6gyf2JGbZuo99HSPWh0E82538GstlraKmKcAyCd1I,5052
 omdev/cli/install.py,sha256=oB34AOwu07sqEztW_z5mgorAFoP_Tw556XiTPj2WSM0,4904
 omdev/cli/main.py,sha256=dxZFyzKuwRykHHhoKKUA0fUa9QsY0dgdvLHbXNuIPCY,6694
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
@@ -134,35 +134,35 @@ omdev/home/secrets.py,sha256=XarB-uhwjRc3dpT5ZF-9yoRPDr7kpyr4Hgs0I4kKL4I,1992
 omdev/home/shadow.py,sha256=6mGDJV70IExa-nzd7mOUW4R3OZIXO0fBwmOUU9T9f4M,295
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
-omdev/interp/cli.py,sha256=hMTpu5sHg0AFCEYOGaipyv2DeCzWp0ZYH1zCByPKqQQ,2375
-omdev/interp/default.py,sha256=FTFQVvA8Lipe8k5eFbf-mLIbrcmfuEXka4ifPyQP8CA,285
-omdev/interp/inject.py,sha256=m2j5XCIi9jc9L0XcbooBD5z4IZ7cddVFObKCbb1t-B8,1488
-omdev/interp/inspect.py,sha256=4dAHCdK8OnQ5uc4tNR5hl0UW8aEigg3lcUMXrEFIWwc,2972
-omdev/interp/resolvers.py,sha256=2IC3dii7qzQX6aXC__4PMi2Gyv8HBSQBMtHVTH3IPls,2585
+omdev/interp/cli.py,sha256=xYZHts_tYuWPenTTLQIQ-I1JWHao6XolsH0R73AufDY,2380
+omdev/interp/default.py,sha256=1jxTsCeCkmYX1QDgr-bPcfSTFdbkYCNKrdfdVf4_P8M,290
+omdev/interp/inject.py,sha256=MOppFILGFCp2f4-2uwmH5fN-7erHI3RyMQJaG0kw0Gc,1569
+omdev/interp/inspect.py,sha256=tRhs4SXIrIjDrrjidNeos87RK6EF6KdTP7EsGECMG3A,2977
+omdev/interp/resolvers.py,sha256=9ExwP0wcQ4mzyTLNurSG4Dg1AQ_IqLfR2ZyqR4VRANE,2590
 omdev/interp/types.py,sha256=Pr0wrVpNasoCw-ThEvKC5LG30Civ7YJ4EONwrwBLpy0,2516
 omdev/interp/venvs.py,sha256=B46sYxamM2X5BG_5KNk07ERtCHFF5Aqz47EGcCZMtP4,3280
 omdev/interp/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/interp/providers/base.py,sha256=aftoEB3FQInKKGDHDSjpnI33cOLBpxPM4Cw_yOuV1fQ,1288
-omdev/interp/providers/inject.py,sha256=rJZDyTSBLw231BYw23UEt0pgrVFxdbRwtqtnXKOgyVc,852
-omdev/interp/providers/running.py,sha256=9MCJAcHotI0EmNIxPwt7b3W715Jp2Gfw1qtMhCEGsUQ,781
-omdev/interp/providers/standalone.py,sha256=zoHeEozKY63GPpFFXkdRmvchPDsltNw8sGTQWfF8wcU,7731
+omdev/interp/providers/inject.py,sha256=NSDFBQVD3ZR9Mf162XB9_VvTUAXGCRhPcrjVlYcFDJk,857
+omdev/interp/providers/running.py,sha256=M3Ni41f-iHRVEySyxogensOfh1RkONQ91kIMrfurY_M,786
+omdev/interp/providers/standalone.py,sha256=9YVU9uGGxDFidnGkQ1kSIvjKrFQyhWDu45gBboFVicI,7736
 omdev/interp/providers/system.py,sha256=Lld7a-SZR9tELHxczm72gOYhjETM5nsz8r4l32y03vw,3991
 omdev/interp/pyenv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/interp/pyenv/inject.py,sha256=4TXH_zoFZXT1f7ntyFMzrX3P2lTQrtooNb6CCDAfmOE,611
+omdev/interp/pyenv/inject.py,sha256=Qj9nCnZn0eZMOx1jNAYi5f2RlIy8SHmN3maPK1ZDWwo,616
 omdev/interp/pyenv/install.py,sha256=knsHpM9R7SRQ7sc9pKqNKEPCkN4e52q4YeSBBNhugpY,8352
-omdev/interp/pyenv/provider.py,sha256=mGkzNGU_q__ZAiQgeum03E7JLhjZ8irnE863QP6daiw,4451
-omdev/interp/pyenv/pyenv.py,sha256=4dDjnnAvEagqWE3NZUWEo1xpTrStB1nGqEcQd9mSm14,2649
+omdev/interp/pyenv/provider.py,sha256=1VJuyBkGmY1ChZ1TY3ihuk7E-4p-MQjGbibzQlgVXPs,4456
+omdev/interp/pyenv/pyenv.py,sha256=Kf1K80v0zcw1BmBQPLczH4dz770_js_ma4Sj4_XOEcU,2654
 omdev/interp/uv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/interp/uv/inject.py,sha256=yX5HKSC6Szfi9PumHUqBVAN1Eh2POR7qQoqO7GoqzeQ,320
-omdev/interp/uv/provider.py,sha256=CA3kx_6iTgU3Uf8CFZ1AiZ8NyvM_6KsnnxO5E-Ji_x0,674
-omdev/interp/uv/uv.py,sha256=kuAgNMoA_LL3m3LFFrjDMYlc-6ZlS_azC2Sqo81pEg4,1779
+omdev/interp/uv/inject.py,sha256=nNCfjD-nrErM8wM__Z51rxqZjV3Cn0kE25jFAbkrPag,595
+omdev/interp/uv/provider.py,sha256=Rq4VEB5rEMd5ZI3Jkk9fJO2JmRXQU36hlWTg1R3ymwE,1018
+omdev/interp/uv/uv.py,sha256=-kp_1hkJemWxwh20isOApSU4uu87grU6mi643wRAtXE,1784
 omdev/magic/__init__.py,sha256=CBzRB71RLyylkrj8dph6JUEddA8KSMJvDgriHqFfJGU,478
 omdev/magic/__main__.py,sha256=1_BAKDtA6Rn5hswyl4S5J78BPRbynX4is_wQsD0U7jI,161
 omdev/magic/cli.py,sha256=DL4V34hSh0yVEtPyl6C7RSYd_td9FOT9Zn7kkyQZhvU,1190
 omdev/magic/find.py,sha256=n9v4XzkYAyh9MVAXRBSmiOlLgZSVbwLYrSJdQBx0G8s,6223
-omdev/magic/magic.py,sha256=dBa85H3VK9BNTKrIFeH5XTwK6dJKseiCx6EqoT0OjYw,230
-omdev/magic/prepare.py,sha256=V5jYT2AeFmazzPwk9sNismSouLwFXEoik6FwKcWCNUY,589
-omdev/magic/styles.py,sha256=QjYxOmrV8jQIFjQF4iaBCpec8Qj9XBsi-NIZoKZwXJ4,665
+omdev/magic/magic.py,sha256=M1aOpp1eimbSxZSlKLbobXRZ15MoRrTtLWK-FQrxtGI,235
+omdev/magic/prepare.py,sha256=SEOK-bl4zDxq0aphYXsEI-hCjbkV908VNnJt-dk0kL4,594
+omdev/magic/styles.py,sha256=6LAL7XR3fkkH2rh-8nwUvdCYVHBkQxCfP0oEuPuw1Bg,670
 omdev/manifests/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/manifests/__main__.py,sha256=JqyVDyV7_jo-NZ3wSs5clDU_xCMlxzJv-XFohoZWQ7E,174
 omdev/manifests/build.py,sha256=HirTi1z0hC_XzUNmvLWsCapr6OrywYk7s1ZQmd-islA,11017
@@ -197,12 +197,12 @@ omdev/precheck/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/precheck/__main__.py,sha256=UEuS4z5-heIrwTtB-ONe1KeXJdqj8tYXMqWMpuO10so,165
 omdev/precheck/base.py,sha256=fKdrfakq2u1UU1_JZFnl-non9bIAZMsSkVY1SMYn8xQ,662
 omdev/precheck/caches.py,sha256=OZKP20DIj6OpUzdNwrjCufv1GzndEbsc7tLD-qHNv9g,1736
-omdev/precheck/git.py,sha256=2Z-xIDDy9MOiPWjBXxQjwSKFaEutR2XBWplydyNqNYg,780
-omdev/precheck/imports.py,sha256=r5r178A7f8_zJbkiHl7C1jZOBe4ESEXKyWX6rfU11W8,2567
-omdev/precheck/lite.py,sha256=rG6NYg0X85eN5UQ8-S7fagP5Ng2Nxwuf5Uh7uI8nQsE,4716
+omdev/precheck/git.py,sha256=O8rNQZ_vlHec0pOFbK6LOkbly5ZIUYT_HXRMqQX8GaI,774
+omdev/precheck/imports.py,sha256=JS-j1YWi_4YL43053xITl6b35isRW-7ChoYoztufVn0,2549
+omdev/precheck/lite.py,sha256=qd6nXWEVut8aBSRD_NxnxXGRNa9ue8mu8ND8rGLisE4,4710
 omdev/precheck/main.py,sha256=VEPdq9n8Yo_HiDqfCdHH1pj3xuJgOzrXie_vWoNbKqw,4303
-omdev/precheck/manifests.py,sha256=4V4_mMh5ptW0jWBmq0nG3bsx3dyjejVs1ReEUoOz-JA,784
-omdev/precheck/scripts.py,sha256=Br163NGbLY6Mjkxr9htdzqqsYWiEJbg9Gq-Glz6YQUI,1342
+omdev/precheck/manifests.py,sha256=EZkChCc9aDlAZswVVvq696p4r3Vy7VBQUSfn6DXhUcc,778
+omdev/precheck/scripts.py,sha256=SyHTVUVMTnBoTzcrWywfwxuUoIfpeV_EQcPQZyaht6c,1336
 omdev/ptk/__init__.py,sha256=IemfBhxxqZe1GeZ2_IMQzqWAB5j0XyARp_aajnonyKY,5142
 omdev/ptk/confirm.py,sha256=kObMUAu-EZC0vdT9LLwtbNA6YLLNmn-Uy18SQTWBTb8,1471
 omdev/ptk/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -252,9 +252,9 @@ omdev/pyproject/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQo04dR1czcc,838
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
-omdev/scripts/ci.py,sha256=PCCZi3PDF8X9uVym6F898TjSYKOmMTRbRw-8cJrrRRY,358020
-omdev/scripts/interp.py,sha256=HHEFZJCO-1r_DLNA2bwmCDgcQiXf6hnCZ_6OALpmHrk,155558
-omdev/scripts/pyproject.py,sha256=Y_QRE_6kxo_k6oobXz4hON3ctPX6NV9I5N4VNZtRKfo,265039
+omdev/scripts/ci.py,sha256=IcEIPLYY92fdl-nEpTRSpNC3q_NNG91YpShloOGH450,358026
+omdev/scripts/interp.py,sha256=SPoPSDco58C61CKUmu1OoFtld9zqYJ1IndBaDZpHUGo,158182
+omdev/scripts/pyproject.py,sha256=n5sZwKVs8XuL-UikTTfRUwSG2e5RY-w3U6PIo66N5OE,267682
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -288,12 +288,12 @@ omdev/tools/git/consts.py,sha256=JuXivUNDkNhM4pe97icjRVAKM8cNRbrODquHINNKqOE,40
 omdev/tools/git/messages.py,sha256=NWztIK0nAKJIOVzuVQcR_5LHZUgqyVkrOlpl7dFLMdU,2424
 omdev/tools/json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/json/__main__.py,sha256=wqpkN_NsQyNwKW4qjVj8ADJ4_C98KhrFBtE-Z1UamfU,168
-omdev/tools/json/cli.py,sha256=GLRg1dz_Y7HEzBtpiLWDZxmuqALMG3--22GFLyaQfl4,9786
+omdev/tools/json/cli.py,sha256=EivaqeBlHNzrOYkSUvvxDUia0TuyS4KPtxrPxvfqFi8,9994
 omdev/tools/json/formats.py,sha256=0IXHUIkcbKnTVP0a53wYWsBMpfVtGTrHN04zRAs2JZo,2049
 omdev/tools/json/io.py,sha256=sfj2hJS9Hy3aUR8a_lLzOrYcmL9fSKyvOHiofdUASsI,1427
-omdev/tools/json/parsing.py,sha256=csoTuG2C2AJB7PgG4TKt2XqdiBAQXtpXRWBxoMkk14g,2103
-omdev/tools/json/processing.py,sha256=BKy385d86psrHVJGsu7U8_giUPUcU_R1s56u9v066VY,1461
-omdev/tools/json/rendering.py,sha256=t33eXnUoYTmusETBnrYrLCpkWLQNvkGmixudrd8C1ag,2573
+omdev/tools/json/parsing.py,sha256=fBqPEmeQAbqSfq2Wuu-0xT1Jr6aTB0SM_KMtaZb7Z_8,2055
+omdev/tools/json/processing.py,sha256=KVMVyW5dTaoPyjn2Aabkay4tBn5cwJJXtLQaJgZI7ZY,2016
+omdev/tools/json/rendering.py,sha256=gCVjNrgfaZoviJNWU8j7Pq4sz1EHYjOxsshC6OxWwDE,2561
 omdev/tools/jsonview/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/jsonview/__main__.py,sha256=BF-MVWpPJJeQYUqJA48G395kxw0lEJnV-hRLV_F9G2A,173
 omdev/tools/jsonview/cli.py,sha256=8pHULS_xxDV00kM8bO5dLH7i-zqQIoNjXTKFwhxSZ_A,4245
@@ -303,9 +303,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev355.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev355.dist-info/METADATA,sha256=WplfvKUSZEo6fA95YNRCzzo_ki_c8UsMX3-ey9MuLIY,1674
-omdev-0.0.0.dev355.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev355.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev355.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev355.dist-info/RECORD,,
+omdev-0.0.0.dev357.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev357.dist-info/METADATA,sha256=v6zON6tQfkSiWWzKCFx9oj3SqsXT0FY-9U9zybw--cQ,1674
+omdev-0.0.0.dev357.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev357.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev357.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev357.dist-info/RECORD,,