ominfra 0.0.0.dev299__tar.gz → 0.0.0.dev301__tar.gz

{ominfra-0.0.0.dev299/ominfra.egg-info → ominfra-0.0.0.dev301}/PKG-INFO

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

ominfra-0.0.0.dev301/README.md

@@ -0,0 +1,34 @@
+# Overview
+
+My python monorepo, the successor to my previous one `omnibus`(... 'ish').
+
+Core packages begin with `om`, scratch app is in `app`, temp / dump code is in `x`.
+
+The packages have no required dependencies besides each other, but there are numerous optional ones - see their
+respective `pyproject.toml` files for details.
+
+General code is written for python 3.12+, '[lite](omlish/README.md#lite-code' code for 3.8+.
+
+# Core packages
+
+- **[omlish](omlish#readme)** - Core foundational code
+- **[omdev](omdev#readme)** - Development utilities
+- **[omserv](omserv)** - Production web server
+- **[ominfra](ominfra)** - Infrastructure and cloud code
+- **[ommlx](ommlx)** - ML / AI code
+
+# Installation
+
+Core packages installable from pypi, or from git via:
+
+```bash
+pip install 'git+https://github.com/wrmsr/omlish@master#subdirectory=.pkg/<pkg>'
+```
+
+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.dev299 → ominfra-0.0.0.dev301}/ominfra/clouds/aws/models/gen/cli.py

@@ -8,7 +8,7 @@ from omlish import check
 from omlish import lang
 from omlish import marshal as msh
 from omlish.argparse import all as ap
-from omlish.configs import all as configs
+from omlish.configs import all as cfgs
 
 from .gen import ModelGen
 
@@ -98,9 +98,9 @@ class Cli(ap.Cli):
         if config_file is None:
             config_file = os.path.abspath(os.path.join(os.path.dirname(__file__), '../services/services.toml'))
 
-        cfg_dct = dict(configs.DEFAULT_FILE_LOADER.load_file(config_file).as_map())
-        cfg_dct = configs.processing.matched_rewrite(
-            configs.processing.build_named_children,
+        cfg_dct = dict(cfgs.DEFAULT_FILE_LOADER.load_file(config_file).as_map())
+        cfg_dct = cfgs.processing.matched_rewrite(
+            cfgs.processing.build_named_children,
             cfg_dct,
             ('services',),
         )

{ominfra-0.0.0.dev299 → ominfra-0.0.0.dev301}/ominfra/scripts/journald2aws.py

@@ -224,6 +224,7 @@ class TomlDecodeError(ValueError):
 
 def toml_load(fp: ta.BinaryIO, /, *, parse_float: TomlParseFloat = float) -> ta.Dict[str, ta.Any]:
     """Parse TOML from a binary file object."""
+
     b = fp.read()
     try:
         s = b.decode()

{ominfra-0.0.0.dev299 → ominfra-0.0.0.dev301}/ominfra/scripts/manage.py

@@ -1463,6 +1463,7 @@ class TomlDecodeError(ValueError):
 
 def toml_load(fp: ta.BinaryIO, /, *, parse_float: TomlParseFloat = float) -> ta.Dict[str, ta.Any]:
     """Parse TOML from a binary file object."""
+
     b = fp.read()
     try:
         s = b.decode()
@@ -10883,7 +10884,7 @@ class AsyncioSubprocesses(AbstractAsyncSubprocesses):
         async with self.popen(*run.cmd, **kwargs) as proc:
             stdout, stderr = await self.communicate(proc, run.input, run.timeout)
 
-        if check and proc.returncode:
+        if run.check and proc.returncode:
             raise subprocess.CalledProcessError(
                 proc.returncode,
                 run.cmd,

{ominfra-0.0.0.dev299 → ominfra-0.0.0.dev301}/ominfra/scripts/supervisor.py

@@ -764,6 +764,7 @@ class TomlDecodeError(ValueError):
 
 def toml_load(fp: ta.BinaryIO, /, *, parse_float: TomlParseFloat = float) -> ta.Dict[str, ta.Any]:
     """Parse TOML from a binary file object."""
+
     b = fp.read()
     try:
         s = b.decode()

{ominfra-0.0.0.dev299 → ominfra-0.0.0.dev301/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev299 → ominfra-0.0.0.dev301}/ominfra.egg-info/requires.txt

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

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

ominfra-0.0.0.dev299/README.md

@@ -1,31 +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:
-
-```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.