ominfra 0.0.0.dev290__tar.gz → 0.0.0.dev292__tar.gz

{ominfra-0.0.0.dev290/ominfra.egg-info → ominfra-0.0.0.dev292}/PKG-INFO

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

ominfra-0.0.0.dev292/README.md

@@ -0,0 +1,31 @@
+It's like my previous python monorepo-ey thing [`omnibus`](https://github.com/wrmsr/omnibus/tree/wrmsr_exp_split)... ish.
+
+Core packages begin with `om`, scratch app is in `app`, temp / dump code is in `x`.
+
+----
+
+The core packages are:
+
+- **omlish**: core foundational code
+- **omdev**: development utilities
+- **omserv**: production web server
+- **ominfra**: infrastructure and cloud code
+- **ommlx**: ml / ai code
+
+----
+
+Core packages installable from pypi, or from git via:
+
+```bash
+pip install 'git+https://github.com/wrmsr/omlish@master#subdirectory=.pkg/<pkg>'
+```
+
+Core packages have no required dependencies, but numerous optional ones - see their respective `pyproject.toml` files for details.
+
+The CLI is installable through uvx or pipx via:
+
+```bash
+curl -LsSf 'https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py' | python3 -
+```
+
+Additional deps to be injected may be appended to the command.

{ominfra-0.0.0.dev290 → ominfra-0.0.0.dev292}/ominfra/scripts/journald2aws.py

@@ -3230,7 +3230,9 @@ class AsyncExitStacked:
 
 
 @contextlib.contextmanager
-def defer(fn: ta.Callable) -> ta.Generator[ta.Callable, None, None]:
+def defer(fn: ta.Callable, *args: ta.Any, **kwargs: ta.Any) -> ta.Generator[ta.Callable, None, None]:
+    if args or kwargs:
+        fn = functools.partial(fn, *args, **kwargs)
     try:
         yield fn
     finally:
@@ -3238,11 +3240,11 @@ def defer(fn: ta.Callable) -> ta.Generator[ta.Callable, None, None]:
 
 
 @contextlib.asynccontextmanager
-async def adefer(fn: ta.Callable) -> ta.AsyncGenerator[ta.Callable, None]:
+async def adefer(fn: ta.Awaitable) -> ta.AsyncGenerator[ta.Awaitable, None]:
     try:
         yield fn
     finally:
-        await fn()
+        await fn
 
 
 ##

{ominfra-0.0.0.dev290 → ominfra-0.0.0.dev292}/ominfra/scripts/manage.py

@@ -5744,7 +5744,9 @@ class AsyncExitStacked:
 
 
 @contextlib.contextmanager
-def defer(fn: ta.Callable) -> ta.Generator[ta.Callable, None, None]:
+def defer(fn: ta.Callable, *args: ta.Any, **kwargs: ta.Any) -> ta.Generator[ta.Callable, None, None]:
+    if args or kwargs:
+        fn = functools.partial(fn, *args, **kwargs)
     try:
         yield fn
     finally:
@@ -5752,11 +5754,11 @@ def defer(fn: ta.Callable) -> ta.Generator[ta.Callable, None, None]:
 
 
 @contextlib.asynccontextmanager
-async def adefer(fn: ta.Callable) -> ta.AsyncGenerator[ta.Callable, None]:
+async def adefer(fn: ta.Awaitable) -> ta.AsyncGenerator[ta.Awaitable, None]:
     try:
         yield fn
     finally:
-        await fn()
+        await fn
 
 
 ##

{ominfra-0.0.0.dev290 → ominfra-0.0.0.dev292/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev290 → ominfra-0.0.0.dev292}/ominfra.egg-info/SOURCES.txt

@@ -1,6 +1,6 @@
 LICENSE
 MANIFEST.in
-README.rst
+README.md
 pyproject.toml
 ominfra/.manifests.json
 ominfra/__about__.py

{ominfra-0.0.0.dev290 → ominfra-0.0.0.dev292}/ominfra.egg-info/requires.txt

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

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

ominfra-0.0.0.dev290/README.rst

@@ -1,38 +0,0 @@
-It's like my previous python monorepo-ey thing `omnibus
-<https://github.com/wrmsr/omnibus/tree/wrmsr_exp_split>`_... ish.
-
-Core packages begin with ``om``, scratch app is in ``app``, temp / dump code is in ``x``.
-
-----
-
-The core packages are:
-
-omlish
-  core foundational code
-omdev
-  development utilities
-omserv
-  production web server
-ominfra
-  infrastructure and cloud code
-ommlx
-  ml / ai code
-
-----
-
-Core packages installable from pypi, or from git via:
-
-.. code-block::
-
-  pip install 'git+https://github.com/wrmsr/omlish@master#subdirectory=.pkg/<pkg>'
-
-Core packages have no required dependencies, but numerous optional ones - see their respective ``pyproject.toml`` files
-for details.
-
-The cli is installable through uvx or pipx via:
-
-.. code-block::
-
-  curl -LsSf https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py | python3 -
-
-Additional deps to be injected may be appended to the command.