ominfra 0.0.0.dev138__tar.gz → 0.0.0.dev139__tar.gz

{ominfra-0.0.0.dev138/ominfra.egg-info → ominfra-0.0.0.dev139}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev138
+Version: 0.0.0.dev139
 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.dev138
-Requires-Dist: omlish==0.0.0.dev138
+Requires-Dist: omdev==0.0.0.dev139
+Requires-Dist: omlish==0.0.0.dev139
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

ominfra-0.0.0.dev138/ominfra/manage/manage.py → ominfra-0.0.0.dev139/ominfra/manage/__init__.py

@@ -1,3 +1,4 @@
+# @omlish-lite
 """
 Jobs:
  - globals

{ominfra-0.0.0.dev138/ominfra/manage/new → ominfra-0.0.0.dev139/ominfra/manage}/main.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# @omlish-amalg ./_manage.py
+# @omlish-amalg ../scripts/manage.py
 # ruff: noqa: UP006 UP007
 """
 manage.py -s 'docker run -i python:3.12'
@@ -23,10 +23,10 @@ from omlish.lite.marshal import register_opj_marshaler
 from omlish.lite.marshal import unmarshal_obj
 from omlish.lite.subprocesses import subprocess_maybe_shell_wrap_exec
 
-from ...pyremote import PyremoteBootstrapDriver
-from ...pyremote import PyremoteBootstrapOptions
-from ...pyremote import pyremote_bootstrap_finalize
-from ...pyremote import pyremote_build_bootstrap_cmd
+from ..pyremote import PyremoteBootstrapDriver
+from ..pyremote import PyremoteBootstrapOptions
+from ..pyremote import pyremote_bootstrap_finalize
+from ..pyremote import pyremote_build_bootstrap_cmd
 from .commands.base import Command
 from .commands.subprocess import SubprocessCommand
 
@@ -140,7 +140,7 @@ def _get_amalg_src(*, amalg_file: ta.Optional[str]) -> str:
         return _get_self_src()
 
     import importlib.resources
-    return importlib.resources.read_text(__package__, '_manage.py')
+    return importlib.resources.files(__package__.split('.')[0] + '.scripts').joinpath('manage.py').read_text()
 
 
 ##

ominfra-0.0.0.dev138/ominfra/manage/new/_manage.py → ominfra-0.0.0.dev139/ominfra/scripts/manage.py

@@ -2,7 +2,7 @@
 # noinspection DuplicatedCode
 # @omlish-lite
 # @omlish-script
-# @omlish-amalg-output main.py
+# @omlish-amalg-output ../manage/main.py
 # ruff: noqa: N802 UP006 UP007 UP036
 """
 manage.py -s 'docker run -i python:3.12'
@@ -52,10 +52,10 @@ if sys.version_info < (3, 8):
 CommandInputT = ta.TypeVar('CommandInputT', bound='Command.Input')
 CommandOutputT = ta.TypeVar('CommandOutputT', bound='Command.Output')
 
-# ../../../omlish/lite/cached.py
+# ../../omlish/lite/cached.py
 T = ta.TypeVar('T')
 
-# ../../../omlish/lite/check.py
+# ../../omlish/lite/check.py
 SizedT = ta.TypeVar('SizedT', bound=ta.Sized)
 
 
@@ -81,7 +81,7 @@ class Command(abc.ABC, ta.Generic[CommandInputT, CommandOutputT]):
 
 
 ########################################
-# ../../../pyremote.py
+# ../../pyremote.py
 """
 Basically this: https://mitogen.networkgenomics.com/howitworks.html
 """
@@ -526,7 +526,7 @@ class PyremoteBootstrapDriver:
 
 
 ########################################
-# ../../../../omlish/lite/cached.py
+# ../../../omlish/lite/cached.py
 
 
 class _cached_nullary:  # noqa
@@ -551,7 +551,7 @@ def cached_nullary(fn):  # ta.Callable[..., T]) -> ta.Callable[..., T]:
 
 
 ########################################
-# ../../../../omlish/lite/check.py
+# ../../../omlish/lite/check.py
 
 
 def check_isinstance(v: ta.Any, spec: ta.Union[ta.Type[T], tuple]) -> T:
@@ -648,7 +648,7 @@ def check_non_empty(v: SizedT) -> SizedT:
 
 
 ########################################
-# ../../../../omlish/lite/json.py
+# ../../../omlish/lite/json.py
 
 
 ##
@@ -679,7 +679,7 @@ json_dumps_compact: ta.Callable[..., str] = functools.partial(json.dumps, **JSON
 
 
 ########################################
-# ../../../../omlish/lite/reflect.py
+# ../../../omlish/lite/reflect.py
 
 
 _GENERIC_ALIAS_TYPES = (
@@ -734,7 +734,7 @@ def deep_subclasses(cls: ta.Type[T]) -> ta.Iterator[ta.Type[T]]:
 
 
 ########################################
-# ../../../../omlish/lite/logs.py
+# ../../../omlish/lite/logs.py
 """
 TODO:
  - translate json keys
@@ -1004,7 +1004,7 @@ def configure_standard_logging(
 
 
 ########################################
-# ../../../../omlish/lite/marshal.py
+# ../../../omlish/lite/marshal.py
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
@@ -1351,7 +1351,7 @@ def unmarshal_obj(o: ta.Any, ty: ta.Union[ta.Type[T], ta.Any]) -> T:
 
 
 ########################################
-# ../../../../omlish/lite/runtime.py
+# ../../../omlish/lite/runtime.py
 
 
 @cached_nullary
@@ -1368,7 +1368,7 @@ def check_runtime_version() -> None:
 
 
 ########################################
-# ../../../../omlish/lite/subprocesses.py
+# ../../../omlish/lite/subprocesses.py
 
 
 ##
@@ -1671,7 +1671,7 @@ def _get_amalg_src(*, amalg_file: ta.Optional[str]) -> str:
         return _get_self_src()
 
     import importlib.resources
-    return importlib.resources.read_text(__package__, '_manage.py')
+    return importlib.resources.files(__package__.split('.')[0] + '.scripts').joinpath('manage.py').read_text()
 
 
 ##

{ominfra-0.0.0.dev138 → ominfra-0.0.0.dev139/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev138
+Version: 0.0.0.dev139
 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.dev138
-Requires-Dist: omlish==0.0.0.dev138
+Requires-Dist: omdev==0.0.0.dev139
+Requires-Dist: omlish==0.0.0.dev139
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev138 → ominfra-0.0.0.dev139}/ominfra.egg-info/SOURCES.txt

@@ -38,42 +38,13 @@ ominfra/journald/genmessages.py
 ominfra/journald/messages.py
 ominfra/journald/tailer.py
 ominfra/manage/__init__.py
-ominfra/manage/manage.py
-ominfra/manage/deploy/__init__.py
-ominfra/manage/deploy/_executor.py
-ominfra/manage/deploy/configs.py
-ominfra/manage/deploy/remote.py
-ominfra/manage/deploy/executor/__init__.py
-ominfra/manage/deploy/executor/base.py
-ominfra/manage/deploy/executor/main.py
-ominfra/manage/deploy/executor/concerns/__init__.py
-ominfra/manage/deploy/executor/concerns/dirs.py
-ominfra/manage/deploy/executor/concerns/nginx.py
-ominfra/manage/deploy/executor/concerns/repo.py
-ominfra/manage/deploy/executor/concerns/supervisor.py
-ominfra/manage/deploy/executor/concerns/systemd.py
-ominfra/manage/deploy/executor/concerns/user.py
-ominfra/manage/deploy/executor/concerns/venv.py
-ominfra/manage/deploy/poly/__init__.py
-ominfra/manage/deploy/poly/_main.py
-ominfra/manage/deploy/poly/base.py
-ominfra/manage/deploy/poly/configs.py
-ominfra/manage/deploy/poly/deploy.py
-ominfra/manage/deploy/poly/main.py
-ominfra/manage/deploy/poly/nginx.py
-ominfra/manage/deploy/poly/repo.py
-ominfra/manage/deploy/poly/runtime.py
-ominfra/manage/deploy/poly/site.py
-ominfra/manage/deploy/poly/supervisor.py
-ominfra/manage/deploy/poly/venv.py
-ominfra/manage/new/__init__.py
-ominfra/manage/new/_manage.py
-ominfra/manage/new/main.py
-ominfra/manage/new/commands/__init__.py
-ominfra/manage/new/commands/base.py
-ominfra/manage/new/commands/subprocess.py
+ominfra/manage/main.py
+ominfra/manage/commands/__init__.py
+ominfra/manage/commands/base.py
+ominfra/manage/commands/subprocess.py
 ominfra/scripts/__init__.py
 ominfra/scripts/journald2aws.py
+ominfra/scripts/manage.py
 ominfra/scripts/supervisor.py
 ominfra/supervisor/LICENSE.txt
 ominfra/supervisor/__init__.py

{ominfra-0.0.0.dev138 → ominfra-0.0.0.dev139}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev138
-omlish==0.0.0.dev138
+omdev==0.0.0.dev139
+omlish==0.0.0.dev139
 
 [all]
 paramiko~=3.5

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