ominfra 0.0.0.dev29__tar.gz → 0.0.0.dev31__tar.gz

{ominfra-0.0.0.dev29/ominfra.egg-info → ominfra-0.0.0.dev31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev29
+Version: 0.0.0.dev31
 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.dev29
+Requires-Dist: omdev==0.0.0.dev31
+Requires-Dist: omlish==0.0.0.dev31
 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.dev29 → ominfra-0.0.0.dev31}/ominfra/__about__.py

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

{ominfra-0.0.0.dev29 → ominfra-0.0.0.dev31}/ominfra/deploy/_executor.py

@@ -48,6 +48,7 @@ import abc
 import argparse
 import base64
 import collections.abc
+import contextlib
 import dataclasses as dc
 import datetime
 import decimal
@@ -440,6 +441,24 @@ class StandardLogHandler(ProxyLogHandler):
 ##
 
 
+@contextlib.contextmanager
+def _locking_logging_module_lock() -> ta.Iterator[None]:
+    if hasattr(logging, '_acquireLock'):
+        logging._acquireLock()  # noqa
+        try:
+            yield
+        finally:
+            logging._releaseLock()  # type: ignore  # noqa
+
+    elif hasattr(logging, '_lock'):
+        # https://github.com/python/cpython/commit/74723e11109a320e628898817ab449b3dad9ee96
+        with logging._lock:  # noqa
+            yield
+
+    else:
+        raise Exception("Can't find lock in logging module")
+
+
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
@@ -447,8 +466,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
 ) -> ta.Optional[StandardLogHandler]:
-    logging._acquireLock()  # type: ignore  # noqa
-    try:
+    with _locking_logging_module_lock():
         if target is None:
             target = logging.root
 
@@ -488,9 +506,6 @@ def configure_standard_logging(
 
         return StandardLogHandler(handler)
 
-    finally:
-        logging._releaseLock()  # type: ignore  # noqa
-
 
 ########################################
 # ../../../../omlish/lite/marshal.py

{ominfra-0.0.0.dev29 → ominfra-0.0.0.dev31}/ominfra/deploy/poly/_main.py

@@ -5,6 +5,7 @@
 # @omdev-amalg-output main.py
 # ruff: noqa: N802 UP006 UP007 UP036
 import abc
+import contextlib
 import dataclasses as dc
 import datetime
 import functools
@@ -498,6 +499,24 @@ class StandardLogHandler(ProxyLogHandler):
 ##
 
 
+@contextlib.contextmanager
+def _locking_logging_module_lock() -> ta.Iterator[None]:
+    if hasattr(logging, '_acquireLock'):
+        logging._acquireLock()  # noqa
+        try:
+            yield
+        finally:
+            logging._releaseLock()  # type: ignore  # noqa
+
+    elif hasattr(logging, '_lock'):
+        # https://github.com/python/cpython/commit/74723e11109a320e628898817ab449b3dad9ee96
+        with logging._lock:  # noqa
+            yield
+
+    else:
+        raise Exception("Can't find lock in logging module")
+
+
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
@@ -505,8 +524,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
 ) -> ta.Optional[StandardLogHandler]:
-    logging._acquireLock()  # type: ignore  # noqa
-    try:
+    with _locking_logging_module_lock():
         if target is None:
             target = logging.root
 
@@ -546,9 +564,6 @@ def configure_standard_logging(
 
         return StandardLogHandler(handler)
 
-    finally:
-        logging._releaseLock()  # type: ignore  # noqa
-
 
 ########################################
 # ../../../../omlish/lite/runtime.py

{ominfra-0.0.0.dev29 → ominfra-0.0.0.dev31}/ominfra/deploy/remote.py

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

{ominfra-0.0.0.dev29 → ominfra-0.0.0.dev31}/ominfra/pyremote/_runcommands.py

@@ -7,6 +7,7 @@
 import abc
 import base64
 import collections.abc
+import contextlib
 import dataclasses as dc
 import datetime
 import decimal
@@ -523,6 +524,24 @@ class StandardLogHandler(ProxyLogHandler):
 ##
 
 
+@contextlib.contextmanager
+def _locking_logging_module_lock() -> ta.Iterator[None]:
+    if hasattr(logging, '_acquireLock'):
+        logging._acquireLock()  # noqa
+        try:
+            yield
+        finally:
+            logging._releaseLock()  # type: ignore  # noqa
+
+    elif hasattr(logging, '_lock'):
+        # https://github.com/python/cpython/commit/74723e11109a320e628898817ab449b3dad9ee96
+        with logging._lock:  # noqa
+            yield
+
+    else:
+        raise Exception("Can't find lock in logging module")
+
+
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
@@ -530,8 +549,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
 ) -> ta.Optional[StandardLogHandler]:
-    logging._acquireLock()  # type: ignore  # noqa
-    try:
+    with _locking_logging_module_lock():
         if target is None:
             target = logging.root
 
@@ -571,9 +589,6 @@ def configure_standard_logging(
 
         return StandardLogHandler(handler)
 
-    finally:
-        logging._releaseLock()  # type: ignore  # noqa
-
 
 ########################################
 # ../../../omlish/lite/marshal.py

{ominfra-0.0.0.dev29 → ominfra-0.0.0.dev31}/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.dev29 → ominfra-0.0.0.dev31}/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.dev29 → ominfra-0.0.0.dev31/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev29
+Version: 0.0.0.dev31
 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.dev29
+Requires-Dist: omdev==0.0.0.dev31
+Requires-Dist: omlish==0.0.0.dev31
 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.dev29 → ominfra-0.0.0.dev31}/ominfra.egg-info/requires.txt

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

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