omlish 0.0.0.dev405__tar.gz → 0.0.0.dev406__tar.gz

{omlish-0.0.0.dev405/omlish.egg-info → omlish-0.0.0.dev406}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev405
+Version: 0.0.0.dev406
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev405 → omlish-0.0.0.dev406}/omlish/.manifests.json

@@ -5,9 +5,9 @@
     "file": "omlish/bootstrap/__main__.py",
     "line": 1,
     "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": "bootstrap",
-        "mod_name": "omlish.bootstrap.__main__"
+      "!omdev.cli.types.CliModule": {
+        "name": "bootstrap",
+        "module": "omlish.bootstrap.__main__"
       }
     }
   },
@@ -17,9 +17,9 @@
     "file": "omlish/diag/procfs.py",
     "line": 361,
     "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": "procfs",
-        "mod_name": "omlish.diag.procfs"
+      "!omdev.cli.types.CliModule": {
+        "name": "procfs",
+        "module": "omlish.diag.procfs"
       }
     }
   },
@@ -29,9 +29,9 @@
     "file": "omlish/formats/cbor.py",
     "line": 30,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.cbor",
-        "attr_name": "CBOR_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.cbor",
+        "attr": "CBOR_CODEC",
         "name": "cbor",
         "aliases": null
       }
@@ -43,9 +43,9 @@
     "file": "omlish/formats/cloudpickle.py",
     "line": 30,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.cloudpickle",
-        "attr_name": "CLOUDPICKLE_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.cloudpickle",
+        "attr": "CLOUDPICKLE_CODEC",
         "name": "cloudpickle",
         "aliases": null
       }
@@ -57,9 +57,9 @@
     "file": "omlish/formats/edn/codec.py",
     "line": 25,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.edn.codec",
-        "attr_name": "EDN_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.edn.codec",
+        "attr": "EDN_CODEC",
         "name": "edn",
         "aliases": null
       }
@@ -71,9 +71,9 @@
     "file": "omlish/formats/ini/codec.py",
     "line": 25,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.ini.codec",
-        "attr_name": "INI_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.ini.codec",
+        "attr": "INI_CODEC",
         "name": "ini",
         "aliases": null
       }
@@ -85,9 +85,9 @@
     "file": "omlish/formats/json/codecs.py",
     "line": 14,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.json.codecs",
-        "attr_name": "JSON_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.json.codecs",
+        "attr": "JSON_CODEC",
         "name": "json",
         "aliases": null
       }
@@ -99,9 +99,9 @@
     "file": "omlish/formats/json/codecs.py",
     "line": 21,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.json.codecs",
-        "attr_name": "JSON_COMPACT_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.json.codecs",
+        "attr": "JSON_COMPACT_CODEC",
         "name": "json-compact",
         "aliases": null
       }
@@ -113,9 +113,9 @@
     "file": "omlish/formats/json/codecs.py",
     "line": 28,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.json.codecs",
-        "attr_name": "JSON_PRETTY_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.json.codecs",
+        "attr": "JSON_PRETTY_CODEC",
         "name": "json-pretty",
         "aliases": null
       }
@@ -127,9 +127,9 @@
     "file": "omlish/formats/json5/codec.py",
     "line": 73,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.json5.codec",
-        "attr_name": "JSON5_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.json5.codec",
+        "attr": "JSON5_CODEC",
         "name": "json5",
         "aliases": null
       }
@@ -141,9 +141,9 @@
     "file": "omlish/formats/pickle.py",
     "line": 30,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.pickle",
-        "attr_name": "PICKLE_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.pickle",
+        "attr": "PICKLE_CODEC",
         "name": "pickle",
         "aliases": null
       }
@@ -155,9 +155,9 @@
     "file": "omlish/formats/repr.py",
     "line": 24,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.repr",
-        "attr_name": "REPR_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.repr",
+        "attr": "REPR_CODEC",
         "name": "repr",
         "aliases": null
       }
@@ -169,9 +169,9 @@
     "file": "omlish/formats/toml/codec.py",
     "line": 16,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.toml.codec",
-        "attr_name": "TOML_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.toml.codec",
+        "attr": "TOML_CODEC",
         "name": "toml",
         "aliases": null
       }
@@ -183,9 +183,9 @@
     "file": "omlish/formats/yaml.py",
     "line": 255,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.yaml",
-        "attr_name": "YAML_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.yaml",
+        "attr": "YAML_CODEC",
         "name": "yaml",
         "aliases": [
           "yml"
@@ -199,9 +199,9 @@
     "file": "omlish/formats/yaml.py",
     "line": 262,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.yaml",
-        "attr_name": "YAML_UNSAFE_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.yaml",
+        "attr": "YAML_UNSAFE_CODEC",
         "name": "yaml-unsafe",
         "aliases": null
       }
@@ -213,9 +213,9 @@
     "file": "omlish/io/compress/brotli.py",
     "line": 46,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.brotli",
-        "attr_name": "BROTLI_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.brotli",
+        "attr": "BROTLI_CODEC",
         "name": "brotli",
         "aliases": null
       }
@@ -227,9 +227,9 @@
     "file": "omlish/io/compress/bz2.py",
     "line": 60,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.bz2",
-        "attr_name": "BZ2_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.bz2",
+        "attr": "BZ2_CODEC",
         "name": "bz2",
         "aliases": null
       }
@@ -241,9 +241,9 @@
     "file": "omlish/io/compress/gzip.py",
     "line": 349,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.gzip",
-        "attr_name": "GZIP_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.gzip",
+        "attr": "GZIP_CODEC",
         "name": "gzip",
         "aliases": [
           "gz"
@@ -257,9 +257,9 @@
     "file": "omlish/io/compress/lz4.py",
     "line": 90,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.lz4",
-        "attr_name": "LZ4_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.lz4",
+        "attr": "LZ4_CODEC",
         "name": "lz4",
         "aliases": null
       }
@@ -271,9 +271,9 @@
     "file": "omlish/io/compress/lzma.py",
     "line": 80,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.lzma",
-        "attr_name": "LZMA_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.lzma",
+        "attr": "LZMA_CODEC",
         "name": "lzma",
         "aliases": null
       }
@@ -285,9 +285,9 @@
     "file": "omlish/io/compress/snappy.py",
     "line": 33,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.snappy",
-        "attr_name": "SNAPPY_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.snappy",
+        "attr": "SNAPPY_CODEC",
         "name": "snappy",
         "aliases": null
       }
@@ -299,9 +299,9 @@
     "file": "omlish/io/compress/zlib.py",
     "line": 73,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.zlib",
-        "attr_name": "ZLIB_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.zlib",
+        "attr": "ZLIB_CODEC",
         "name": "zlib",
         "aliases": null
       }
@@ -313,9 +313,9 @@
     "file": "omlish/io/compress/zstd.py",
     "line": 51,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.zstd",
-        "attr_name": "ZSTD_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.zstd",
+        "attr": "ZSTD_CODEC",
         "name": "zstd",
         "aliases": null
       }
@@ -327,9 +327,9 @@
     "file": "omlish/os/pidfiles/__main__.py",
     "line": 1,
     "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": "pidfiles",
-        "mod_name": "omlish.os.pidfiles.__main__"
+      "!omdev.cli.types.CliModule": {
+        "name": "pidfiles",
+        "module": "omlish.os.pidfiles.__main__"
       }
     }
   },
@@ -339,9 +339,9 @@
     "file": "omlish/secrets/pwgen.py",
     "line": 78,
     "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": "pwgen",
-        "mod_name": "omlish.secrets.pwgen"
+      "!omdev.cli.types.CliModule": {
+        "name": "pwgen",
+        "module": "omlish.secrets.pwgen"
       }
     }
   },
@@ -351,12 +351,12 @@
     "file": "omlish/specs/jmespath/__main__.py",
     "line": 1,
     "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": [
+      "!omdev.cli.types.CliModule": {
+        "name": [
           "jmespath",
           "jp"
         ],
-        "mod_name": "omlish.specs.jmespath.__main__"
+        "module": "omlish.specs.jmespath.__main__"
       }
     }
   }

{omlish-0.0.0.dev405 → omlish-0.0.0.dev406}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev405'
-__revision__ = '2845f7bb7c8df0a75acb7e7dece1fc712a54aa05'
+__version__ = '0.0.0.dev406'
+__revision__ = '0862d2e5f3852ab4290573b9bea974cf1e8103a3'
 
 
 #

omlish-0.0.0.dev406/omlish/bootstrap/__main__.py

@@ -0,0 +1,11 @@
+# @omlish-manifest
+_CLI_MODULE = {'!omdev.cli.types.CliModule': {
+    'name': 'bootstrap',
+    'module': __name__,
+}}
+
+
+if __name__ == '__main__':
+    from .main import _main
+
+    _main()

{omlish-0.0.0.dev405 → omlish-0.0.0.dev406}/omlish/codecs/base.py

@@ -95,13 +95,13 @@ class LazyLoadedCodec(ModAttrManifest):
     @classmethod
     def new(
             cls,
-            mod_name: str,
-            attr_name: str,
+            module: str,
+            attr: str,
             codec: Codec,
     ) -> 'LazyLoadedCodec':
         return cls(
-            mod_name=mod_name,
-            attr_name=attr_name,
+            module=module,
+            attr=attr,
             name=codec.name,
             aliases=codec.aliases,
         )

{omlish-0.0.0.dev405 → omlish-0.0.0.dev406}/omlish/diag/procfs.py

@@ -359,9 +359,9 @@ def _main() -> None:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'procfs',
-    'mod_name': __name__,
+_CLI_MODULE = {'!omdev.cli.types.CliModule': {
+    'name': 'procfs',
+    'module': __name__,
 }}
 
 

{omlish-0.0.0.dev405 → omlish-0.0.0.dev406}/omlish/formats/codecs.py

@@ -85,12 +85,12 @@ def make_str_object_codec(
 
 
 def make_object_lazy_loaded_codec(
-        mod_name: str,
-        attr_name: str,
+        module: str,
+        attr: str,
         codec: ObjectCodec,
 ) -> codecs.LazyLoadedCodec:
     return codecs.LazyLoadedCodec.new(
-        mod_name,
-        attr_name,
+        module,
+        attr,
         codec,
     )

{omlish-0.0.0.dev405 → omlish-0.0.0.dev406}/omlish/io/compress/codecs.py

@@ -67,12 +67,12 @@ def make_compression_codec(
 
 
 def make_compression_lazy_loaded_codec(
-        mod_name: str,
-        attr_name: str,
+        module: str,
+        attr: str,
         codec: CompressionCodec,
 ) -> codecs.LazyLoadedCodec:
     return codecs.LazyLoadedCodec.new(
-        mod_name,
-        attr_name,
+        module,
+        attr,
         codec,
     )

{omlish-0.0.0.dev405 → omlish-0.0.0.dev406}/omlish/manifests/base.py

@@ -12,14 +12,14 @@ NameAliasesManifestT = ta.TypeVar('NameAliasesManifestT', bound='NameAliasesMani
 
 @dc.dataclass(frozen=True)
 class ModAttrManifest:
-    mod_name: str
-    attr_name: str
+    module: str
+    attr: str
 
     def load(self) -> ta.Any:
         import importlib  # noqa
 
-        mod = importlib.import_module(self.mod_name)
-        return getattr(mod, self.attr_name)
+        mod = importlib.import_module(self.module)
+        return getattr(mod, self.attr)
 
 
 ##