omdev 0.0.0.dev400__tar.gz → 0.0.0.dev401__tar.gz

{omdev-0.0.0.dev400/omdev.egg-info → omdev-0.0.0.dev401}/PKG-INFO

@@ -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 → omdev-0.0.0.dev401}/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-0.0.0.dev400 → omdev-0.0.0.dev401}/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-0.0.0.dev400 → omdev-0.0.0.dev401}/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-0.0.0.dev400 → omdev-0.0.0.dev401}/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 → omdev-0.0.0.dev401/omdev.egg-info}/PKG-INFO

@@ -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 → omdev-0.0.0.dev401}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev400
+omlish==0.0.0.dev401
 
 [all]
 black~=25.1

{omdev-0.0.0.dev400 → omdev-0.0.0.dev401}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev400'
+version = '0.0.0.dev401'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev400',
+    'omlish == 0.0.0.dev401',
 ]
 
 [project.optional-dependencies]