ominfra 0.0.0.dev24__py3-none-any.whl → 0.0.0.dev26__py3-none-any.whl

ominfra/__about__.py

@@ -13,7 +13,7 @@ class Project(ProjectBase):
 
     optional_dependencies = {
         'ssh': [
-            'paramiko ~= 3.4',  # !! LGPL
+            'paramiko ~= 3.5',  # !! LGPL
 
             'asyncssh ~= 2.17; python_version < "3.13"',  # cffi
         ],
@@ -25,3 +25,13 @@ class Setuptools(SetuptoolsBase):
         'include': [Project.name, f'{Project.name}.*'],
         'exclude': [*SetuptoolsBase.find_packages['exclude']],
     }
+
+    package_data = {
+        **SetuptoolsBase.package_data,
+
+        '*': [
+            *SetuptoolsBase.package_data['*'],
+
+            'Dockerfile',
+        ],
+    }

ominfra/_manifests.json

@@ -0,0 +1 @@
+[]

ominfra/clouds/aws/auth.py

@@ -15,6 +15,7 @@ import typing as ta
 import urllib.parse
 
 from omlish import check
+from omlish import lang
 
 
 ##
@@ -128,7 +129,7 @@ class V4AwsSigner:
         #
 
         if utcnow is None:
-            utcnow = datetime.datetime.utcnow()  # noqa
+            utcnow = lang.utcnow()
         req_dt = utcnow.strftime(_ISO8601)
 
         #

ominfra/deploy/_executor.py

@@ -3,6 +3,7 @@
 # @omlish-lite
 # @omlish-script
 # @omdev-amalg-output executor/main.py
+# ruff: noqa: N802 UP006 UP007 UP036
 r"""
 TODO:
  - flock
@@ -43,7 +44,6 @@ spec = <name>--<rev>--<when>
 https://docs.docker.com/config/containers/multi-service_container/#use-a-process-manager
 https://serverfault.com/questions/211525/supervisor-not-loading-new-configuration-files
 """  # noqa
-# ruff: noqa: UP007
 import abc
 import argparse
 import base64
@@ -70,6 +70,17 @@ import uuid
 import weakref  # noqa
 
 
+########################################
+
+
+if sys.version_info < (3, 8):
+    raise OSError(
+        f'Requires python (3, 8), got {sys.version_info} from {sys.executable}')  # noqa
+
+
+########################################
+
+
 # ../../../../omlish/lite/check.py
 T = ta.TypeVar('T')
 
@@ -119,7 +130,6 @@ class cached_nullary:  # noqa
 
 ########################################
 # ../../../../omlish/lite/check.py
-# ruff: noqa: UP006 UP007
 
 
 def check_isinstance(v: T, spec: ta.Union[ta.Type[T], tuple]) -> T:
@@ -179,7 +189,6 @@ json_dumps_compact: ta.Callable[..., str] = functools.partial(json.dumps, **JSON
 
 ########################################
 # ../../../../omlish/lite/reflect.py
-# ruff: noqa: UP006
 
 
 _GENERIC_ALIAS_TYPES = (
@@ -232,7 +241,6 @@ TODO:
  - translate json keys
  - debug
 """
-# ruff: noqa: UP006 UP007 N802
 
 
 log = logging.getLogger(__name__)
@@ -431,46 +439,51 @@ def configure_standard_logging(
         *,
         json: bool = False,
         target: ta.Optional[logging.Logger] = None,
-        no_check: bool = False,
+        force: bool = False,
 ) -> ta.Optional[StandardLogHandler]:
-    if target is None:
-        target = logging.root
+    logging._acquireLock()  # type: ignore  # noqa
+    try:
+        if target is None:
+            target = logging.root
 
-    #
+        #
 
-    if not no_check:
-        if any(isinstance(h, StandardLogHandler) for h in list(target.handlers)):
-            return None
+        if not force:
+            if any(isinstance(h, StandardLogHandler) for h in list(target.handlers)):
+                return None
 
-    #
+        #
 
-    handler = logging.StreamHandler()
+        handler = logging.StreamHandler()
 
-    #
+        #
 
-    formatter: logging.Formatter
-    if json:
-        formatter = JsonLogFormatter()
-    else:
-        formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
-    handler.setFormatter(formatter)
+        formatter: logging.Formatter
+        if json:
+            formatter = JsonLogFormatter()
+        else:
+            formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+        handler.setFormatter(formatter)
+
+        #
 
-    #
+        handler.addFilter(TidLogFilter())
 
-    handler.addFilter(TidLogFilter())
+        #
 
-    #
+        target.addHandler(handler)
 
-    target.addHandler(handler)
+        #
 
-    #
+        if level is not None:
+            target.setLevel(level)
 
-    if level is not None:
-        target.setLevel(level)
+        #
 
-    #
+        return StandardLogHandler(handler)
 
-    return StandardLogHandler(handler)
+    finally:
+        logging._releaseLock()  # type: ignore  # noqa
 
 
 ########################################
@@ -480,7 +493,6 @@ TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
  - nonstrict toggle
 """
-# ruff: noqa: UP006 UP007
 
 
 ##
@@ -796,7 +808,6 @@ def check_runtime_version() -> None:
 
 ########################################
 # ../../../../omlish/lite/subprocesses.py
-# ruff: noqa: UP006 UP007
 
 
 ##
@@ -903,7 +914,6 @@ def subprocess_try_output_str(*args: str, **kwargs: ta.Any) -> ta.Optional[str]:
 
 ########################################
 # ../base.py
-# ruff: noqa: UP006
 
 
 ##

ominfra/deploy/poly/_main.py

@@ -3,6 +3,7 @@
 # @omlish-lite
 # @omlish-script
 # @omdev-amalg-output main.py
+# ruff: noqa: N802 UP006 UP007 UP036
 import abc
 import dataclasses as dc
 import datetime
@@ -21,6 +22,17 @@ import threading
 import typing as ta
 
 
+########################################
+
+
+if sys.version_info < (3, 8):
+    raise OSError(
+        f'Requires python (3, 8), got {sys.version_info} from {sys.executable}')  # noqa
+
+
+########################################
+
+
 # ../base.py
 T = ta.TypeVar('T')
 ConcernT = ta.TypeVar('ConcernT')
@@ -31,7 +43,6 @@ DeployConcernConfigT = ta.TypeVar('DeployConcernConfigT', bound='DeployConcernCo
 
 ########################################
 # ../configs.py
-# ruff: noqa: UP006
 
 
 ##
@@ -122,7 +133,6 @@ json_dumps_compact: ta.Callable[..., str] = functools.partial(json.dumps, **JSON
 
 ########################################
 # ../base.py
-# ruff: noqa: UP006 UP007
 
 
 ##
@@ -295,7 +305,6 @@ TODO:
  - translate json keys
  - debug
 """
-# ruff: noqa: UP006 UP007 N802
 
 
 log = logging.getLogger(__name__)
@@ -494,46 +503,51 @@ def configure_standard_logging(
         *,
         json: bool = False,
         target: ta.Optional[logging.Logger] = None,
-        no_check: bool = False,
+        force: bool = False,
 ) -> ta.Optional[StandardLogHandler]:
-    if target is None:
-        target = logging.root
+    logging._acquireLock()  # type: ignore  # noqa
+    try:
+        if target is None:
+            target = logging.root
 
-    #
+        #
 
-    if not no_check:
-        if any(isinstance(h, StandardLogHandler) for h in list(target.handlers)):
-            return None
+        if not force:
+            if any(isinstance(h, StandardLogHandler) for h in list(target.handlers)):
+                return None
 
-    #
+        #
 
-    handler = logging.StreamHandler()
+        handler = logging.StreamHandler()
 
-    #
+        #
 
-    formatter: logging.Formatter
-    if json:
-        formatter = JsonLogFormatter()
-    else:
-        formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
-    handler.setFormatter(formatter)
+        formatter: logging.Formatter
+        if json:
+            formatter = JsonLogFormatter()
+        else:
+            formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+        handler.setFormatter(formatter)
+
+        #
 
-    #
+        handler.addFilter(TidLogFilter())
 
-    handler.addFilter(TidLogFilter())
+        #
 
-    #
+        target.addHandler(handler)
 
-    target.addHandler(handler)
+        #
 
-    #
+        if level is not None:
+            target.setLevel(level)
 
-    if level is not None:
-        target.setLevel(level)
+        #
 
-    #
+        return StandardLogHandler(handler)
 
-    return StandardLogHandler(handler)
+    finally:
+        logging._releaseLock()  # type: ignore  # noqa
 
 
 ########################################
@@ -676,7 +690,6 @@ class SiteImpl(Site):
 
 ########################################
 # ../../../../omlish/lite/subprocesses.py
-# ruff: noqa: UP006 UP007
 
 
 ##
@@ -783,7 +796,6 @@ def subprocess_try_output_str(*args: str, **kwargs: ta.Any) -> ta.Optional[str]:
 
 ########################################
 # ../runtime.py
-# ruff: noqa: UP007
 
 
 class RuntimeImpl(Runtime):

ominfra/manage/manage.py

@@ -5,4 +5,8 @@ Jobs:
  - pyenv
  - tailscale
  - docker
+ - system nginx
+ - system service manager - systemd / supervisor
+ - users
+ - firewall
 """

ominfra/pyremote/_runcommands.py

@@ -3,7 +3,7 @@
 # @omlish-lite
 # @omlish-script
 # @omdev-amalg-output runcommands.py
-# ruff: noqa: UP006 UP007
+# ruff: noqa: N802 UP006 UP007 UP036
 import abc
 import base64
 import collections.abc
@@ -29,6 +29,17 @@ import weakref  # noqa
 import zlib
 
 
+########################################
+
+
+if sys.version_info < (3, 8):
+    raise OSError(
+        f'Requires python (3, 8), got {sys.version_info} from {sys.executable}')  # noqa
+
+
+########################################
+
+
 # ../../../omlish/lite/check.py
 T = ta.TypeVar('T')
 
@@ -202,7 +213,6 @@ class cached_nullary:  # noqa
 
 ########################################
 # ../../../omlish/lite/check.py
-# ruff: noqa: UP006 UP007
 
 
 def check_isinstance(v: T, spec: ta.Union[ta.Type[T], tuple]) -> T:
@@ -262,7 +272,6 @@ json_dumps_compact: ta.Callable[..., str] = functools.partial(json.dumps, **JSON
 
 ########################################
 # ../../../omlish/lite/reflect.py
-# ruff: noqa: UP006
 
 
 _GENERIC_ALIAS_TYPES = (
@@ -315,7 +324,6 @@ TODO:
  - translate json keys
  - debug
 """
-# ruff: noqa: UP006 UP007 N802
 
 
 log = logging.getLogger(__name__)
@@ -514,46 +522,51 @@ def configure_standard_logging(
         *,
         json: bool = False,
         target: ta.Optional[logging.Logger] = None,
-        no_check: bool = False,
+        force: bool = False,
 ) -> ta.Optional[StandardLogHandler]:
-    if target is None:
-        target = logging.root
+    logging._acquireLock()  # type: ignore  # noqa
+    try:
+        if target is None:
+            target = logging.root
 
-    #
+        #
 
-    if not no_check:
-        if any(isinstance(h, StandardLogHandler) for h in list(target.handlers)):
-            return None
+        if not force:
+            if any(isinstance(h, StandardLogHandler) for h in list(target.handlers)):
+                return None
 
-    #
+        #
 
-    handler = logging.StreamHandler()
+        handler = logging.StreamHandler()
 
-    #
+        #
 
-    formatter: logging.Formatter
-    if json:
-        formatter = JsonLogFormatter()
-    else:
-        formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
-    handler.setFormatter(formatter)
+        formatter: logging.Formatter
+        if json:
+            formatter = JsonLogFormatter()
+        else:
+            formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+        handler.setFormatter(formatter)
+
+        #
 
-    #
+        handler.addFilter(TidLogFilter())
 
-    handler.addFilter(TidLogFilter())
+        #
 
-    #
+        target.addHandler(handler)
 
-    target.addHandler(handler)
+        #
 
-    #
+        if level is not None:
+            target.setLevel(level)
 
-    if level is not None:
-        target.setLevel(level)
+        #
 
-    #
+        return StandardLogHandler(handler)
 
-    return StandardLogHandler(handler)
+    finally:
+        logging._releaseLock()  # type: ignore  # noqa
 
 
 ########################################
@@ -563,7 +576,6 @@ TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
  - nonstrict toggle
 """
-# ruff: noqa: UP006 UP007
 
 
 ##
@@ -879,7 +891,6 @@ def check_runtime_version() -> None:
 
 ########################################
 # ../../../omlish/lite/subprocesses.py
-# ruff: noqa: UP006 UP007
 
 
 ##

{ominfra-0.0.0.dev24.dist-info → ominfra-0.0.0.dev26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev24
+Version: 0.0.0.dev26
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,11 +12,11 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish ==0.0.0.dev24
+Requires-Dist: omlish ==0.0.0.dev26
 Provides-Extra: all
-Requires-Dist: paramiko ~=3.4 ; extra == 'all'
+Requires-Dist: paramiko ~=3.5 ; extra == 'all'
 Requires-Dist: asyncssh ~=2.17 ; (python_version < "3.13") and extra == 'all'
 Provides-Extra: ssh
-Requires-Dist: paramiko ~=3.4 ; extra == 'ssh'
+Requires-Dist: paramiko ~=3.5 ; extra == 'ssh'
 Requires-Dist: asyncssh ~=2.17 ; (python_version < "3.13") and extra == 'ssh'
 

{ominfra-0.0.0.dev24.dist-info → ominfra-0.0.0.dev26.dist-info}/RECORD

@@ -1,12 +1,13 @@
-ominfra/__about__.py,sha256=5DfZfpjDGdRPquXrfFEFaeTLkc69qr1i-ELbJ0R-HKI,625
+ominfra/__about__.py,sha256=85wKRxpYiPufujvp6ARwSgFG2VAikpx0ULgQ4l6plpU,793
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ominfra/_manifests.json,sha256=N1F-Xz3GaBn2H1p7uKzhkhKCQV8QVR0t76XD6wmFtXA,3
 ominfra/cmds.py,sha256=E0AfnvEmnKntXWvmLW5L05_NeDpBET1VBXn7vV6EwBQ,2083
 ominfra/ssh.py,sha256=U-JCvx41KI0B0riHy7cpFCKCx_LAHeSn-Irz5aAao2w,5393
 ominfra/clouds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/clouds/aws/auth.py,sha256=eV6ayidQDKrhsgoRSg4_1tSvTMa1TzFvzxS7D_gjlCc,5499
+ominfra/clouds/aws/auth.py,sha256=EW3lK1U0hnjXkTn1KWJeuv9GG0ibbKdvgLD0P6HJtwo,5502
 ominfra/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/deploy/_executor.py,sha256=txU0eH3rVc_8a8PLac9WXCD0EsdK8NDPf2PdE7TKIGc,31519
+ominfra/deploy/_executor.py,sha256=b5no2fpqEDv3k8OnD-coYiLWcwuOKqWz57Rdj2R6Fhg,31832
 ominfra/deploy/configs.py,sha256=qi0kwT7G2NH7dXLOQic-u6R3yeadup_QtvrjwWIggbM,435
 ominfra/deploy/remote.py,sha256=LJSe3AJlpvNgb_5QtUiK2JIkKC2OgMvjSD1701_y2uI,2147
 ominfra/deploy/executor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -21,7 +22,7 @@ ominfra/deploy/executor/concerns/systemd.py,sha256=MtsSEToEa1HNouern_JukcYTnypw_
 ominfra/deploy/executor/concerns/user.py,sha256=j5LDfQXquIp-eEM7t6aShsrYoQrM_ILXZycTmTcRVxA,686
 ominfra/deploy/executor/concerns/venv.py,sha256=jbRriqJHO4r9Zyo5Hfl_qVmcU6Qm6UgrouBroKcPn2g,775
 ominfra/deploy/poly/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
-ominfra/deploy/poly/_main.py,sha256=PtFGmt5MA87KTgni9goPaz0r4HuzD2HgpmsCtjFQ_v8,22751
+ominfra/deploy/poly/_main.py,sha256=fg-lvMik6X0WVYl_AjvPuy8wv1IdiiY8WVaDnMe-f34,23110
 ominfra/deploy/poly/base.py,sha256=Bd-CzUTaDvTRbdXKiTxMxs77WCEXItwNoBYCRnTk1u4,4167
 ominfra/deploy/poly/configs.py,sha256=9bzWdbxhOk_Q4KokDjmRz254KHnUU71Vl1frLlhQyU4,584
 ominfra/deploy/poly/deploy.py,sha256=tMYKslXLjstcv86siRt5j37USsS0Wd6lsfeGRE26zio,544
@@ -33,15 +34,15 @@ ominfra/deploy/poly/site.py,sha256=QJwDDJoVm2-kxi4bxIrp-mn4y2qDLuW3CAUax3W8gv8,2
 ominfra/deploy/poly/supervisor.py,sha256=zkl6VQBcAZaMAhyR9DbbbqULcgFCDZoe9S_vP-mMFQ8,2289
 ominfra/deploy/poly/venv.py,sha256=BoipDEa4NTeodjf3L57KJfq9eGKLagFNKwD8pS4yrzA,1552
 ominfra/manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/manage/manage.py,sha256=gS2FvvdZTmNqD2dEXWTCFgCXNCepFSHVojBZ5WG6mqk,65
+ominfra/manage/manage.py,sha256=BttL8LFEknHZE_h2Pt5dAqbfUkv6qy43WI0raXBZ1a8,151
 ominfra/pyremote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/pyremote/_runcommands.py,sha256=Lo138TWUkFWhpIzNAllnUuTz5QgpqpnzdGNA2J3Nfj4,25339
+ominfra/pyremote/_runcommands.py,sha256=TqivGhMdddcL5Z1Ml2W2C3FMw_woaKtrw9BEy5wQ1Vk,25666
 ominfra/pyremote/bootstrap.py,sha256=ybXxNitrNKuPAIl0SrU55Ktn-4R-bDveAm_ZURrmfF0,3368
 ominfra/pyremote/runcommands.py,sha256=hXXP41rvgL46Oe_HOcLSp2Y84ZMQfEZqqV_jNd1x7Ak,1570
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=vgLgohPwRog8e5pEljI2hOGg-Li5fcwjj-nXj2j8IQo,5918
-ominfra-0.0.0.dev24.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev24.dist-info/METADATA,sha256=kpbIpcroublflte8heBWUXxAgKYZwOkfOnSvTqQnZr0,764
-ominfra-0.0.0.dev24.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-ominfra-0.0.0.dev24.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev24.dist-info/RECORD,,
+ominfra-0.0.0.dev26.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev26.dist-info/METADATA,sha256=4QQEfPEH9yeS-os5LNXa7A1QehcqCDNEer9h7G9zJxE,764
+ominfra-0.0.0.dev26.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+ominfra-0.0.0.dev26.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev26.dist-info/RECORD,,

{ominfra-0.0.0.dev24.dist-info → ominfra-0.0.0.dev26.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any