ominfra 0.0.0.dev160__tar.gz → 0.0.0.dev162__tar.gz

{ominfra-0.0.0.dev160/ominfra.egg-info → ominfra-0.0.0.dev162}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev160
+Version: 0.0.0.dev162
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev160
-Requires-Dist: omlish==0.0.0.dev160
+Requires-Dist: omdev==0.0.0.dev162
+Requires-Dist: omlish==0.0.0.dev162
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev160 → ominfra-0.0.0.dev162}/ominfra/manage/deploy/git.py

@@ -15,8 +15,8 @@ import typing as ta
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import async_cached_nullary
 from omlish.lite.check import check
+from omlish.os.atomics import AtomicPathSwapping
 
-from .atomics import DeployAtomicPathSwapping
 from .paths import SingleDirDeployPathOwner
 from .specs import DeployGitCheckout
 from .specs import DeployGitRepo
@@ -32,7 +32,7 @@ class DeployGitManager(SingleDirDeployPathOwner):
             self,
             *,
             deploy_home: ta.Optional[DeployHome] = None,
-            atomics: DeployAtomicPathSwapping,
+            atomics: AtomicPathSwapping,
     ) -> None:
         super().__init__(
             owned_dir='git',

{ominfra-0.0.0.dev160 → ominfra-0.0.0.dev162}/ominfra/manage/deploy/inject.py

@@ -5,10 +5,10 @@ import typing as ta
 from omlish.lite.inject import InjectorBindingOrBindings
 from omlish.lite.inject import InjectorBindings
 from omlish.lite.inject import inj
+from omlish.os.atomics import AtomicPathSwapping
 
 from ..commands.inject import bind_command
 from .apps import DeployAppManager
-from .atomics import DeployAtomicPathSwapping
 from .commands import DeployCommand
 from .commands import DeployCommandExecutor
 from .config import DeployConfig
@@ -34,7 +34,7 @@ def bind_deploy(
         inj.bind(DeployGitManager, singleton=True),
 
         inj.bind(DeployTmpManager, singleton=True),
-        inj.bind(DeployAtomicPathSwapping, to_key=DeployTmpManager),
+        inj.bind(AtomicPathSwapping, to_key=DeployTmpManager),
 
         inj.bind(DeployVenvManager, singleton=True),
 

{ominfra-0.0.0.dev160 → ominfra-0.0.0.dev162}/ominfra/manage/deploy/tmp.py

@@ -3,18 +3,18 @@ import typing as ta
 
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
+from omlish.os.atomics import AtomicPathSwap
+from omlish.os.atomics import AtomicPathSwapKind
+from omlish.os.atomics import AtomicPathSwapping
+from omlish.os.atomics import TempDirAtomicPathSwapping
 
-from .atomics import DeployAtomicPathSwap
-from .atomics import DeployAtomicPathSwapKind
-from .atomics import DeployAtomicPathSwapping
-from .atomics import TempDirDeployAtomicPathSwapping
 from .paths import SingleDirDeployPathOwner
 from .types import DeployHome
 
 
 class DeployTmpManager(
     SingleDirDeployPathOwner,
-    DeployAtomicPathSwapping,
+    AtomicPathSwapping,
 ):
     def __init__(
             self,
@@ -27,18 +27,18 @@ class DeployTmpManager(
         )
 
     @cached_nullary
-    def _swapping(self) -> DeployAtomicPathSwapping:
-        return TempDirDeployAtomicPathSwapping(
+    def _swapping(self) -> AtomicPathSwapping:
+        return TempDirAtomicPathSwapping(
             temp_dir=self._make_dir(),
             root_dir=check.non_empty_str(self._deploy_home),
         )
 
     def begin_atomic_path_swap(
             self,
-            kind: DeployAtomicPathSwapKind,
+            kind: AtomicPathSwapKind,
             dst_path: str,
             **kwargs: ta.Any,
-    ) -> DeployAtomicPathSwap:
+    ) -> AtomicPathSwap:
         return self._swapping().begin_atomic_path_swap(
             kind,
             dst_path,

{ominfra-0.0.0.dev160 → ominfra-0.0.0.dev162}/ominfra/manage/deploy/venvs.py

@@ -10,8 +10,8 @@ import typing as ta
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
+from omlish.os.atomics import AtomicPathSwapping
 
-from .atomics import DeployAtomicPathSwapping
 from .paths import DeployPath
 from .paths import DeployPathOwner
 from .types import DeployAppTag
@@ -23,7 +23,7 @@ class DeployVenvManager(DeployPathOwner):
             self,
             *,
             deploy_home: ta.Optional[DeployHome] = None,
-            atomics: DeployAtomicPathSwapping,
+            atomics: AtomicPathSwapping,
     ) -> None:
         super().__init__()
 

{ominfra-0.0.0.dev160 → ominfra-0.0.0.dev162}/ominfra/manage/targets/connection.py

@@ -105,7 +105,7 @@ class DockerManageTargetConnector(ManageTargetConnector):
         if dmt.image is not None:
             sh_parts.extend(['run', '-i', dmt.image])
         elif dmt.container_id is not None:
-            sh_parts.extend(['exec', dmt.container_id])
+            sh_parts.extend(['exec', '-i', dmt.container_id])
         else:
             raise ValueError(dmt)