ominfra 0.0.0.dev192__tar.gz → 0.0.0.dev193__tar.gz

{ominfra-0.0.0.dev192/ominfra.egg-info → ominfra-0.0.0.dev193}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev192
+Version: 0.0.0.dev193
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,9 +12,9 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev192
-Requires-Dist: omlish==0.0.0.dev192
-Requires-Dist: omserv==0.0.0.dev192
+Requires-Dist: omdev==0.0.0.dev193
+Requires-Dist: omlish==0.0.0.dev193
+Requires-Dist: omserv==0.0.0.dev193
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev192 → ominfra-0.0.0.dev193}/ominfra/configs.py

@@ -1,11 +1,10 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
-import io
 import json
 import os.path
 import typing as ta
 
-from omdev.toml.parser import toml_loads
+from omlish.formats.toml.parser import toml_loads
 from omlish.lite.check import check
 from omlish.lite.marshal import OBJ_MARSHALER_MANAGER
 from omlish.lite.marshal import ObjMarshalerManager
@@ -15,8 +14,6 @@ T = ta.TypeVar('T')
 
 ConfigMapping = ta.Mapping[str, ta.Any]
 
-IniConfigSectionSettingsMap = ta.Mapping[str, ta.Mapping[str, ta.Union[str, ta.Sequence[str]]]]  # ta.TypeAlias
-
 
 ##
 
@@ -103,27 +100,3 @@ def build_config_named_children(
         seen.add(n)
 
     return lst
-
-
-##
-
-
-def render_ini_config(
-        settings_by_section: IniConfigSectionSettingsMap,
-) -> str:
-    out = io.StringIO()
-
-    for i, (section, settings) in enumerate(settings_by_section.items()):
-        if i:
-            out.write('\n')
-
-        out.write(f'[{section}]\n')
-
-        for k, v in settings.items():
-            if isinstance(v, str):
-                out.write(f'{k}={v}\n')
-            else:
-                for vv in v:
-                    out.write(f'{k}={vv}\n')
-
-    return out.getvalue()

{ominfra-0.0.0.dev192 → ominfra-0.0.0.dev193}/ominfra/manage/deploy/conf/manager.py

@@ -29,7 +29,7 @@ from omlish.os.paths import relative_symlink
 from omserv.nginx.configs import NginxConfigItems
 from omserv.nginx.configs import render_nginx_config_str
 
-from ....configs import render_ini_config
+from omlish.formats.ini.sections import render_ini_sections
 from ..paths.paths import DeployPath
 from ..tags import DEPLOY_TAG_SEPARATOR
 from ..tags import DeployApp
@@ -100,7 +100,7 @@ class DeployConfManager:
 
         elif isinstance(ac, IniDeployAppConfContent):
             ini_sections = pcc(ac.sections)
-            return strip_with_newline(render_ini_config(ini_sections))
+            return strip_with_newline(render_ini_sections(ini_sections))
 
         elif isinstance(ac, NginxDeployAppConfContent):
             nginx_items = NginxConfigItems.of(pcc(ac.items))

{ominfra-0.0.0.dev192 → ominfra-0.0.0.dev193}/ominfra/manage/deploy/conf/specs.py

@@ -6,7 +6,7 @@ import typing as ta
 from omlish.lite.check import check
 from omlish.lite.marshal import register_single_field_type_obj_marshaler
 
-from ....configs import IniConfigSectionSettingsMap
+from omlish.formats.ini.sections import IniSectionSettingsMap
 from ..paths.specs import check_valid_deploy_spec_path
 
 
@@ -41,7 +41,7 @@ class JsonDeployAppConfContent(DeployAppConfContent):
 @register_single_field_type_obj_marshaler('sections')
 @dc.dataclass(frozen=True)
 class IniDeployAppConfContent(DeployAppConfContent):
-    sections: IniConfigSectionSettingsMap
+    sections: IniSectionSettingsMap
 
 
 #

{ominfra-0.0.0.dev192 → ominfra-0.0.0.dev193}/ominfra/scripts/journald2aws.py

@@ -52,7 +52,7 @@ if sys.version_info < (3, 8):
 ########################################
 
 
-# ../../../../omdev/toml/parser.py
+# ../../../../omlish/formats/toml/parser.py
 TomlParseFloat = ta.Callable[[str], ta.Any]
 TomlKey = ta.Tuple[str, ...]
 TomlPos = int  # ta.TypeAlias
@@ -74,7 +74,6 @@ ExitStackedT = ta.TypeVar('ExitStackedT', bound='ExitStacked')
 
 # ../../../configs.py
 ConfigMapping = ta.Mapping[str, ta.Any]
-IniConfigSectionSettingsMap = ta.Mapping[str, ta.Mapping[str, ta.Union[str, ta.Sequence[str]]]]  # ta.TypeAlias
 
 # ../../../threadworkers.py
 ThreadWorkerT = ta.TypeVar('ThreadWorkerT', bound='ThreadWorker')
@@ -84,7 +83,7 @@ SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlia
 
 
 ########################################
-# ../../../../../omdev/toml/parser.py
+# ../../../../../omlish/formats/toml/parser.py
 # SPDX-License-Identifier: MIT
 # SPDX-FileCopyrightText: 2021 Taneli Hukkinen
 # Licensed to PSF under a Contributor Agreement.
@@ -3371,30 +3370,6 @@ def build_config_named_children(
     return lst
 
 
-##
-
-
-def render_ini_config(
-        settings_by_section: IniConfigSectionSettingsMap,
-) -> str:
-    out = io.StringIO()
-
-    for i, (section, settings) in enumerate(settings_by_section.items()):
-        if i:
-            out.write('\n')
-
-        out.write(f'[{section}]\n')
-
-        for k, v in settings.items():
-            if isinstance(v, str):
-                out.write(f'{k}={v}\n')
-            else:
-                for vv in v:
-                    out.write(f'{k}={vv}\n')
-
-    return out.getvalue()
-
-
 ########################################
 # ../../../../journald/messages.py