ominfra 0.0.0.dev29__py3-none-any.whl → 0.0.0.dev31__py3-none-any.whl

ominfra/__about__.py

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

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/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/deploy/remote.py

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

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/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/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.dist-info → ominfra-0.0.0.dev31.dist-info}/METADATA

@@ -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.dist-info → ominfra-0.0.0.dev31.dist-info}/RECORD

@@ -1,15 +1,15 @@
 ominfra/.manifests.json,sha256=N1F-Xz3GaBn2H1p7uKzhkhKCQV8QVR0t76XD6wmFtXA,3
-ominfra/__about__.py,sha256=RD3ttxVUkwiE9eo9wxHTded8fSmYx0i51yFIvpXD-FY,625
+ominfra/__about__.py,sha256=KP7VzaIkaT-yn7kYFo-y6t7cFk5ke3hpISgFLy4IcwY,660
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/cmds.py,sha256=E0AfnvEmnKntXWvmLW5L05_NeDpBET1VBXn7vV6EwBQ,2083
-ominfra/ssh.py,sha256=U-JCvx41KI0B0riHy7cpFCKCx_LAHeSn-Irz5aAao2w,5393
+ominfra/ssh.py,sha256=0GH_dpjCG0vWCT2Lh2v6pB-Y4IRsVNXfA5wDsZDvyKk,5392
 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=EW3lK1U0hnjXkTn1KWJeuv9GG0ibbKdvgLD0P6HJtwo,5502
 ominfra/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/deploy/_executor.py,sha256=Wcka4kOwATqEYGGLIW63SJSohGhVgGatXpPcNC1D9Ms,31939
+ominfra/deploy/_executor.py,sha256=r2aFWr1RBPgLCOXKoSwigxWXTfyIx8aEBM2lcTF5xtQ,32397
 ominfra/deploy/configs.py,sha256=qi0kwT7G2NH7dXLOQic-u6R3yeadup_QtvrjwWIggbM,435
-ominfra/deploy/remote.py,sha256=LJSe3AJlpvNgb_5QtUiK2JIkKC2OgMvjSD1701_y2uI,2147
+ominfra/deploy/remote.py,sha256=6ACmpXU1uBdyGs3Xsp97ktKFq30cJlzN9LRWNUWlGY4,2144
 ominfra/deploy/executor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/deploy/executor/base.py,sha256=AjpUT1iPsJHrDNzcflZ9IazpClmWZaGjYxE0NIBazoQ,2815
 ominfra/deploy/executor/main.py,sha256=PFx-rRMcO-J0kvklZsgjz2CbdQZC__42n9vuve56A4A,2640
@@ -22,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=fg-lvMik6X0WVYl_AjvPuy8wv1IdiiY8WVaDnMe-f34,23110
+ominfra/deploy/poly/_main.py,sha256=D0adtLE_WftgPP2oIjF5kJxDct1EaE8GO-J-NI8MTrk,23568
 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
@@ -36,13 +36,13 @@ ominfra/deploy/poly/venv.py,sha256=BoipDEa4NTeodjf3L57KJfq9eGKLagFNKwD8pS4yrzA,1
 ominfra/manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/manage.py,sha256=BttL8LFEknHZE_h2Pt5dAqbfUkv6qy43WI0raXBZ1a8,151
 ominfra/pyremote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/pyremote/_runcommands.py,sha256=mOr5pueEese3mjWbi6EFWCvTxkDELstMQ55ipbfaJRA,25773
+ominfra/pyremote/_runcommands.py,sha256=at26lcZ6n7w718uCI8zoqUh8jHzBPfM-r_oZ38W57HY,26231
 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.dev29.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev29.dist-info/METADATA,sha256=w_QxYEweeWnLdB01iuoxa6rwygDq6UFloSQVANZmauY,764
-ominfra-0.0.0.dev29.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-ominfra-0.0.0.dev29.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev29.dist-info/RECORD,,
+ominfra/tools/listresources.py,sha256=4LhqZcBHVIAME0ulYKjPJV1tVKKBevPSGKaJXbxTBbI,5917
+ominfra-0.0.0.dev31.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev31.dist-info/METADATA,sha256=PTaZLGiUlmOTyhtiwcELLVxJZPD12TUxr1FrMN92buI,799
+ominfra-0.0.0.dev31.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+ominfra-0.0.0.dev31.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev31.dist-info/RECORD,,