ominfra 0.0.0.dev25__tar.gz → 0.0.0.dev27__tar.gz

{ominfra-0.0.0.dev25/ominfra.egg-info → ominfra-0.0.0.dev27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev25
+Version: 0.0.0.dev27
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,10 +12,10 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev25
+Requires-Dist: omlish==0.0.0.dev27
 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.dev25 → ominfra-0.0.0.dev27}/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,13 +25,3 @@ class Setuptools(SetuptoolsBase):
         'include': [Project.name, f'{Project.name}.*'],
         'exclude': [*SetuptoolsBase.find_packages['exclude']],
     }
-
-    package_data = {
-        **SetuptoolsBase.package_data,
-
-        '*': [
-            *SetuptoolsBase.package_data['*'],
-
-            'Dockerfile',
-        ],
-    }

{ominfra-0.0.0.dev25 → ominfra-0.0.0.dev27}/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-0.0.0.dev25 → ominfra-0.0.0.dev27}/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:
@@ -146,6 +156,12 @@ def check_not(v: ta.Any) -> None:
     return v
 
 
+def check_non_empty_str(v: ta.Optional[str]) -> str:
+    if not v:
+        raise ValueError
+    return v
+
+
 ########################################
 # ../../../../omlish/lite/json.py
 
@@ -179,7 +195,6 @@ json_dumps_compact: ta.Callable[..., str] = functools.partial(json.dumps, **JSON
 
 ########################################
 # ../../../../omlish/lite/reflect.py
-# ruff: noqa: UP006
 
 
 _GENERIC_ALIAS_TYPES = (
@@ -232,7 +247,6 @@ TODO:
  - translate json keys
  - debug
 """
-# ruff: noqa: UP006 UP007 N802
 
 
 log = logging.getLogger(__name__)
@@ -431,46 +445,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 +499,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 +814,6 @@ def check_runtime_version() -> None:
 
 ########################################
 # ../../../../omlish/lite/subprocesses.py
-# ruff: noqa: UP006 UP007
 
 
 ##
@@ -903,7 +920,6 @@ def subprocess_try_output_str(*args: str, **kwargs: ta.Any) -> ta.Optional[str]:
 
 ########################################
 # ../base.py
-# ruff: noqa: UP006
 
 
 ##

{ominfra-0.0.0.dev25 → ominfra-0.0.0.dev27}/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-0.0.0.dev27/ominfra/manage/manage.py

@@ -0,0 +1,12 @@
+"""
+Jobs:
+ - globals
+ - pkgs
+ - pyenv
+ - tailscale
+ - docker
+ - system nginx
+ - system service manager - systemd / supervisor
+ - users
+ - firewall
+"""

{ominfra-0.0.0.dev25 → ominfra-0.0.0.dev27}/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:
@@ -229,6 +239,12 @@ def check_not(v: ta.Any) -> None:
     return v
 
 
+def check_non_empty_str(v: ta.Optional[str]) -> str:
+    if not v:
+        raise ValueError
+    return v
+
+
 ########################################
 # ../../../omlish/lite/json.py
 
@@ -262,7 +278,6 @@ json_dumps_compact: ta.Callable[..., str] = functools.partial(json.dumps, **JSON
 
 ########################################
 # ../../../omlish/lite/reflect.py
-# ruff: noqa: UP006
 
 
 _GENERIC_ALIAS_TYPES = (
@@ -315,7 +330,6 @@ TODO:
  - translate json keys
  - debug
 """
-# ruff: noqa: UP006 UP007 N802
 
 
 log = logging.getLogger(__name__)
@@ -514,46 +528,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 +582,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 +897,6 @@ def check_runtime_version() -> None:
 
 ########################################
 # ../../../omlish/lite/subprocesses.py
-# ruff: noqa: UP006 UP007
 
 
 ##

{ominfra-0.0.0.dev25 → ominfra-0.0.0.dev27/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev25
+Version: 0.0.0.dev27
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,10 +12,10 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev25
+Requires-Dist: omlish==0.0.0.dev27
 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.dev25 → ominfra-0.0.0.dev27}/ominfra.egg-info/SOURCES.txt

@@ -2,9 +2,9 @@ LICENSE
 MANIFEST.in
 README.rst
 pyproject.toml
+ominfra/.manifests.json
 ominfra/__about__.py
 ominfra/__init__.py
-ominfra/_manifests.json
 ominfra/cmds.py
 ominfra/ssh.py
 ominfra.egg-info/PKG-INFO

{ominfra-0.0.0.dev25 → ominfra-0.0.0.dev27}/ominfra.egg-info/requires.txt

@@ -1,13 +1,13 @@
-omlish==0.0.0.dev25
+omlish==0.0.0.dev27
 
 [all]
-paramiko~=3.4
+paramiko~=3.5
 
 [all:python_version < "3.13"]
 asyncssh~=2.17
 
 [ssh]
-paramiko~=3.4
+paramiko~=3.5
 
 [ssh:python_version < "3.13"]
 asyncssh~=2.17

{ominfra-0.0.0.dev25 → ominfra-0.0.0.dev27}/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.dev25'
+version = '0.0.0.dev27'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,16 +22,16 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omlish == 0.0.0.dev25',
+    'omlish == 0.0.0.dev27',
 ]
 
 [project.optional-dependencies]
 all = [
-    'paramiko ~= 3.4',
+    'paramiko ~= 3.5',
     'asyncssh ~= 2.17; python_version < "3.13"',
 ]
 ssh = [
-    'paramiko ~= 3.4',
+    'paramiko ~= 3.5',
     'asyncssh ~= 2.17; python_version < "3.13"',
 ]
 
@@ -51,9 +51,8 @@ exclude = [
 '*' = [
     '*.c',
     '*.cc',
+    '*.cu',
     '*.h',
-    '*.json',
-    '*.sql',
+    '.manifests.json',
     'LICENSE',
-    'Dockerfile',
 ]

ominfra-0.0.0.dev25/ominfra/manage/manage.py

@@ -1,8 +0,0 @@
-"""
-Jobs:
- - globals
- - pkgs
- - pyenv
- - tailscale
- - docker
-"""