ominfra 0.0.0.dev30__tar.gz → 0.0.0.dev32__tar.gz

{ominfra-0.0.0.dev30/ominfra.egg-info → ominfra-0.0.0.dev32}/PKG-INFO

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

{ominfra-0.0.0.dev30 → ominfra-0.0.0.dev32}/ominfra/__about__.py

@@ -8,6 +8,7 @@ class Project(ProjectBase):
     description = 'ominfra'
 
     dependencies = [
+        f'omdev == {__version__}',
         f'omlish == {__version__}',
     ]
 

{ominfra-0.0.0.dev30 → ominfra-0.0.0.dev32}/ominfra/deploy/_executor.py

@@ -2,7 +2,7 @@
 # noinspection DuplicatedCode
 # @omlish-lite
 # @omlish-script
-# @omdev-amalg-output executor/main.py
+# @omlish-amalg-output executor/main.py
 # ruff: noqa: N802 UP006 UP007 UP036
 r"""
 TODO:

{ominfra-0.0.0.dev30 → ominfra-0.0.0.dev32}/ominfra/deploy/executor/main.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# @omdev-amalg ../_executor.py
+# @omlish-amalg ../_executor.py
 r"""
 TODO:
  - flock

{ominfra-0.0.0.dev30 → ominfra-0.0.0.dev32}/ominfra/deploy/poly/_main.py

@@ -2,7 +2,7 @@
 # noinspection DuplicatedCode
 # @omlish-lite
 # @omlish-script
-# @omdev-amalg-output main.py
+# @omlish-amalg-output main.py
 # ruff: noqa: N802 UP006 UP007 UP036
 import abc
 import contextlib

{ominfra-0.0.0.dev30 → ominfra-0.0.0.dev32}/ominfra/deploy/poly/main.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# @omdev-amalg ./_main.py
+# @omlish-amalg ./_main.py
 from .deploy import DeployImpl  # noqa
 from .nginx import NginxDeployConcern  # noqa
 from .nginx import NginxSiteConcern  # noqa

{ominfra-0.0.0.dev30 → ominfra-0.0.0.dev32}/ominfra/deploy/remote.py

@@ -1,5 +1,5 @@
 """
-lookit:
+See:
  - piku, obviously
  - https://github.com/mitogen-hq/mitogen/
 

{ominfra-0.0.0.dev30 → ominfra-0.0.0.dev32}/ominfra/pyremote/_runcommands.py

@@ -2,7 +2,7 @@
 # noinspection DuplicatedCode
 # @omlish-lite
 # @omlish-script
-# @omdev-amalg-output runcommands.py
+# @omlish-amalg-output runcommands.py
 # ruff: noqa: N802 UP006 UP007 UP036
 import abc
 import base64
@@ -58,8 +58,8 @@ Basically this: https://mitogen.networkgenomics.com/howitworks.html
 _BOOTSTRAP_COMM_FD = 100
 _BOOTSTRAP_SRC_FD = 101
 
-_BOOTSTRAP_CHILD_PID_VAR = '_PYR_CPID'
-_BOOTSTRAP_ARGV0_VAR = '_PYR_ARGV0'
+_BOOTSTRAP_CHILD_PID_VAR = '_OPYR_CPID'
+_BOOTSTRAP_ARGV0_VAR = '_OPYR_ARGV0'
 
 BOOTSTRAP_ACK0 = b'OPYR000\n'
 BOOTSTRAP_ACK1 = b'OPYR001\n'

{ominfra-0.0.0.dev30 → ominfra-0.0.0.dev32}/ominfra/pyremote/bootstrap.py

@@ -16,8 +16,8 @@ import zlib
 _BOOTSTRAP_COMM_FD = 100
 _BOOTSTRAP_SRC_FD = 101
 
-_BOOTSTRAP_CHILD_PID_VAR = '_PYR_CPID'
-_BOOTSTRAP_ARGV0_VAR = '_PYR_ARGV0'
+_BOOTSTRAP_CHILD_PID_VAR = '_OPYR_CPID'
+_BOOTSTRAP_ARGV0_VAR = '_OPYR_ARGV0'
 
 BOOTSTRAP_ACK0 = b'OPYR000\n'
 BOOTSTRAP_ACK1 = b'OPYR001\n'

{ominfra-0.0.0.dev30 → ominfra-0.0.0.dev32}/ominfra/pyremote/runcommands.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# @omdev-amalg ./_runcommands.py
+# @omlish-amalg ./_runcommands.py
 # ruff: noqa: UP006 UP007
 import dataclasses as dc
 import io

{ominfra-0.0.0.dev30 → ominfra-0.0.0.dev32}/ominfra/ssh.py

@@ -18,10 +18,10 @@ import contextlib
 import shlex
 import typing as ta
 
+from omdev.secrets import load_secrets
 from omlish import check
 from omlish import dataclasses as dc
 from omlish import lang
-from omserv.secrets import load_secrets
 
 from .cmds import CommandRunner
 from .cmds import LocalCommandRunner

{ominfra-0.0.0.dev30 → ominfra-0.0.0.dev32}/ominfra/tools/listresources.py

@@ -16,10 +16,10 @@ import typing as ta
 
 import urllib3
 
+from omdev.secrets import load_secrets
 from omlish import check
 from omlish import dataclasses as dc
 from omlish import lang
-from omserv.secrets import load_secrets
 
 
 ##

{ominfra-0.0.0.dev30 → ominfra-0.0.0.dev32/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev30 → ominfra-0.0.0.dev32}/ominfra.egg-info/requires.txt

@@ -1,4 +1,5 @@
-omlish==0.0.0.dev30
+omdev==0.0.0.dev32
+omlish==0.0.0.dev32
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev30 → ominfra-0.0.0.dev32}/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.dev30'
+version = '0.0.0.dev32'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omlish == 0.0.0.dev30',
+    'omdev == 0.0.0.dev32',
+    'omlish == 0.0.0.dev32',
 ]
 
 [project.optional-dependencies]