omdev 0.0.0.dev400__py3-none-any.whl → 0.0.0.dev401__py3-none-any.whl

omdev/cli/main.py

@@ -13,7 +13,8 @@ import typing as ta
 
 from omlish import check
 from omlish.lite.cached import cached_nullary
-from omlish.manifests.globals import MANIFEST_LOADER
+from omlish.manifests.globals import GlobalManifestLoader
+from omlish.manifests.loading import ManifestLoader
 
 from .types import CliCmd
 from .types import CliFunc
@@ -183,16 +184,18 @@ def _build_arg_parser() -> argparse.ArgumentParser:
 
 
 def _build_cmd_set(args: ta.Any) -> CliCmdSet:
-    ldr = MANIFEST_LOADER.from_entry_point(
-        globals(),
-        cls_instantiator=MANIFEST_LOADER.instantiate_cls,
+    ldr = ManifestLoader(
+        **ManifestLoader.kwargs_from_entry_point(
+            globals(),
+            **GlobalManifestLoader.default_kwargs(),
+        ),
     )
 
     #
 
-    pkgs = ldr.scan_or_discover_pkgs(
-        specified_roots=args.cli_pkg_root,
-        fallback_root=os.getcwd(),
+    pkgs = ldr.scan_or_discover_packages(
+        specified_root_dirs=args.cli_pkg_root,
+        fallback_root_dir=os.getcwd(),
     )
 
     #
@@ -200,7 +203,7 @@ def _build_cmd_set(args: ta.Any) -> CliCmdSet:
     lst: list[CliCmd] = []
 
     for m in ldr.load(*pkgs, only=[CliModule]):
-        lst.append(check.isinstance(m.value, CliModule))
+        lst.append(check.isinstance(m.value(), CliModule))
 
     lst.extend(_CLI_FUNCS)
 

omdev/manifests/building.py

@@ -9,6 +9,10 @@ TODO:
  - is this lite? or not?
  - can this run externally? or not? what does it have to import?
   - has to import manifest classes, but not modules with manifest magics
+ - !! can make lite / amalg / embeddable with 'manifest base class markers':
+  - rather than issubclass(cls, ModAttrManifest), can do if cls.__omlish_manifest_class__ == 'mod_attr'
+   - reject unknowns
+   - can analyze statically
 
 See (entry_points):
  - https://github.com/pytest-dev/pluggy/blob/main/src/pluggy/_manager.py#L405
@@ -37,7 +41,7 @@ from omlish.lite.imports import import_attr
 from omlish.lite.json import json_dumps_pretty
 from omlish.lite.logs import log
 from omlish.manifests.base import ModAttrManifest
-from omlish.manifests.globals import MANIFEST_LOADER
+from omlish.manifests.globals import GlobalManifestLoader
 from omlish.manifests.types import Manifest
 from omlish.manifests.types import ManifestOrigin
 
@@ -427,5 +431,5 @@ def check_package_manifests(
         [(key, value_dct)] = manifest.value.items()
         if key.startswith('$.'):
             key = f'${name}{key[1:]}'
-        cls = MANIFEST_LOADER.load_cls(key)
-        value = MANIFEST_LOADER.instantiate_cls(cls, **value_dct)  # noqa
+        cls = GlobalManifestLoader.instance()._load_class(key)  # noqa
+        value = GlobalManifestLoader.instance()._instantiate_value(cls, **value_dct)  # noqa

omdev/precheck/manifests.py

@@ -1,7 +1,7 @@
 import dataclasses as dc
 import typing as ta
 
-from omlish.manifests.globals import MANIFEST_LOADER
+from omlish.manifests.globals import GlobalManifestLoader
 
 from .base import Precheck
 from .base import PrecheckContext
@@ -23,6 +23,6 @@ class ManifestsPrecheck(Precheck['ManifestsPrecheck.Config']):
     async def run(self) -> ta.AsyncGenerator[Precheck.Violation]:
         for src_root in sorted(self._context.src_roots):
             try:
-                MANIFEST_LOADER.load(src_root)
+                GlobalManifestLoader.load(src_root)
             except Exception as e:  # noqa
                 yield Precheck.Violation(self, f'Error loading manifest for {src_root}: {e!r}')

omdev/tools/git/messages.py

@@ -54,10 +54,10 @@ class StaticGitMessageGeneratorManifest(StaticModAttrManifest, GitMessageGenerat
 
 @cached.function
 def load_message_generator_manifests() -> ta.Sequence[GitMessageGeneratorManifest]:
-    ldr = manifest_globals.MANIFEST_LOADER
-    pkgs = ldr.scan_or_discover_pkgs(fallback_root=os.getcwd())
+    ldr = manifest_globals.GlobalManifestLoader.instance()
+    pkgs = ldr.scan_or_discover_packages(fallback_root_dir=os.getcwd())
     mfs = ldr.load(*pkgs, only=[GitMessageGeneratorManifest])
-    return [mf.value for mf in mfs]
+    return [mf.value() for mf in mfs]
 
 
 @cached.function

{omdev-0.0.0.dev400.dist-info → omdev-0.0.0.dev401.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev400
+Version: 0.0.0.dev401
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev400
+Requires-Dist: omlish==0.0.0.dev401
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev400.dist-info → omdev-0.0.0.dev401.dist-info}/RECORD

@@ -113,7 +113,7 @@ omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=UshIZX3oeXq0De-9X28gy2LgKMZDf_dzabdkUhZJdNA,2124
 omdev/cli/clicli.py,sha256=TZnQYHyyh97B6N_pVYYduYgt03s8Yp5mrJ7wblXWSWY,6308
 omdev/cli/install.py,sha256=oB34AOwu07sqEztW_z5mgorAFoP_Tw556XiTPj2WSM0,4904
-omdev/cli/main.py,sha256=M3r8ARUKJbI3U7xVNI6a1i64YWBkt-NNC8jTJzCYUOE,6772
+omdev/cli/main.py,sha256=eUvc64Wi6ROcSG7V_yzrmhpY2CgR12cyz9eJGXE0xlI,6885
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
 omdev/cli/types.py,sha256=SH88B81otsSYNM-PM3Ry1wgLLvyg2M6fBJkWOajWIWM,485
 omdev/clipboard/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -182,7 +182,7 @@ omdev/magic/styles.py,sha256=6LAL7XR3fkkH2rh-8nwUvdCYVHBkQxCfP0oEuPuw1Bg,670
 omdev/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/manifests/__main__.py,sha256=JqyVDyV7_jo-NZ3wSs5clDU_xCMlxzJv-XFohoZWQ7E,174
 omdev/manifests/_dumping.py,sha256=RyphKkXhTnb8zWqcWjAR-GN8vNbBM9-PrZ3fJEvF1RE,44230
-omdev/manifests/building.py,sha256=e1cNN3wPrINlRROu2hW8W9Jz0PmIByZCD5RvoNr-J8Y,13287
+omdev/manifests/building.py,sha256=O-SBzMfqXAfLVunQJ29fzV6zCaMrrM3lVpf7iFHCxuM,13568
 omdev/manifests/dumping.py,sha256=WF911eYL3LT6powrQT3w83XIM_RdExDgTSsGiNomSIo,4506
 omdev/manifests/main.py,sha256=mYb8iM5bdwaO8jSd9_hIBSoYLf2h7e0iLb9aCCbgJ6c,2175
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -218,7 +218,7 @@ omdev/precheck/git.py,sha256=O8rNQZ_vlHec0pOFbK6LOkbly5ZIUYT_HXRMqQX8GaI,774
 omdev/precheck/imports.py,sha256=3loQxHMrpI0ce4-le77NCSxutLac_5vDW4UDX7KWWg8,2565
 omdev/precheck/lite.py,sha256=qd6nXWEVut8aBSRD_NxnxXGRNa9ue8mu8ND8rGLisE4,4710
 omdev/precheck/main.py,sha256=_1A5wiu9p2th1dn_17w1ZIFtMmCIOaTFpWyvK0jopEA,4374
-omdev/precheck/manifests.py,sha256=96deAjSGCqKPJz8sAqzx8YY3SCbMzO9v-hytfxPPDJU,789
+omdev/precheck/manifests.py,sha256=5Hlo_3BF5HbcLPxn93fhDS9yy9k6iL2vFsqFNfoU9q4,799
 omdev/precheck/scripts.py,sha256=6nb_lDgyX7u9kdF_BU6ubY01q_jGk96VH9q9gpOieng,1753
 omdev/precheck/unicode.py,sha256=VUNDCrlfUas_U8ugV_q0eFUXuBgKjS8YdCFm0FXREXo,2583
 omdev/ptk/__init__.py,sha256=4zhIfvhebFj4TJRRN1SQkcAe-7elizcfZLsD-fIlZsI,5198
@@ -303,7 +303,7 @@ omdev/tools/git/__main__.py,sha256=gI87SBUgTkKUcUM-RtZWnei-UUDDqzbr5aPztb-gvbE,1
 omdev/tools/git/cli.py,sha256=I4AiCTz4OCzK6s8J2TJF1eYw9FH2JIK_CsdjQH_9UTE,16757
 omdev/tools/git/cloning.py,sha256=CNGBBMoWaTBJW4SZTf1VvhDFSm0yg7qDfNwZun_PFbU,891
 omdev/tools/git/consts.py,sha256=JuXivUNDkNhM4pe97icjRVAKM8cNRbrODquHINNKqOE,40
-omdev/tools/git/messages.py,sha256=yYJL8O3d2DJbtH0C850Dx5u7Wo9zhiX_ijKFpWnVRow,2433
+omdev/tools/git/messages.py,sha256=ZZuDMDGnMo3se-EE2mJbRDOFlaIBUBT6fMX0DRG9yD8,2459
 omdev/tools/json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/json/__main__.py,sha256=wqpkN_NsQyNwKW4qjVj8ADJ4_C98KhrFBtE-Z1UamfU,168
 omdev/tools/json/cli.py,sha256=8aXX3ijU3lvPZamkIyUOz-vlBmyIdaX7dCQq5rN7adE,10193
@@ -321,9 +321,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=ao5mdrpiSU4AZ8mBozoEaV3UVlmVTnRG9wD9XP70MZE,11429
-omdev-0.0.0.dev400.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev400.dist-info/METADATA,sha256=MATrBsUxzjUtEfAhaAxoSZG-gp7WXDVaGKR52qDdI8c,5094
-omdev-0.0.0.dev400.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev400.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev400.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev400.dist-info/RECORD,,
+omdev-0.0.0.dev401.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev401.dist-info/METADATA,sha256=RLScNFrnOubL8SappIzdHqIWaA3uKwZ8kK0S_5o3XrA,5094
+omdev-0.0.0.dev401.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev401.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev401.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev401.dist-info/RECORD,,