omdev 0.0.0.dev404__tar.gz → 0.0.0.dev405__tar.gz

{omdev-0.0.0.dev404/omdev.egg-info → omdev-0.0.0.dev405}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev404
+Version: 0.0.0.dev405
 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.dev404
+Requires-Dist: omlish==0.0.0.dev405
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev404 → omdev-0.0.0.dev405}/omdev/.manifests.json

@@ -236,7 +236,7 @@
     "module": ".py.scripts.execstat",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/scripts/execstat.py",
-    "line": 86,
+    "line": 89,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/execstat",
@@ -404,7 +404,7 @@
     "module": ".tools.git.messages",
     "attr": "_TIMESTAMP_GIT_MESSAGE_GENERATOR_MANIFEST",
     "file": "omdev/tools/git/messages.py",
-    "line": 85,
+    "line": 81,
     "value": {
       "$.tools.git.messages.GitMessageGeneratorManifest": {
         "mod_name": "omdev.tools.git.messages",

{omdev-0.0.0.dev404 → omdev-0.0.0.dev405}/omdev/cli/main.py

@@ -6,7 +6,6 @@ TODO:
 """
 import argparse
 import dataclasses as dc
-import os
 import runpy
 import sys
 import typing as ta
@@ -184,26 +183,24 @@ def _build_arg_parser() -> argparse.ArgumentParser:
 
 
 def _build_cmd_set(args: ta.Any) -> CliCmdSet:
-    ldr = ManifestLoader(
-        **ManifestLoader.kwargs_from_entry_point(
-            globals(),
-            **GlobalManifestLoader.default_kwargs(),
-        ),
-    )
+    ldr_cfg = GlobalManifestLoader.default_config()
 
-    #
+    ldr_cfg |= ManifestLoader.config_from_entry_point(globals())
+
+    if args.cli_pkg_root:
+        ldr_cfg |= ManifestLoader.Config(
+            package_scan_root_dirs=args.cli_pkg_root,
+            discover_packages=False,
+        )
 
-    pkgs = ldr.scan_or_discover_packages(
-        specified_root_dirs=args.cli_pkg_root,
-        fallback_root_dir=os.getcwd(),
-    )
+    GlobalManifestLoader.initialize(ldr_cfg)
 
     #
 
     lst: list[CliCmd] = []
 
-    for m in ldr.load(*pkgs, only=[CliModule]):
-        lst.append(check.isinstance(m.value(), CliModule))
+    for mv in GlobalManifestLoader.load_values_of(CliModule):
+        lst.append(check.isinstance(mv, CliModule))
 
     lst.extend(_CLI_FUNCS)
 

{omdev-0.0.0.dev404 → omdev-0.0.0.dev405}/omdev/precheck/manifests.py

@@ -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:
-                GlobalManifestLoader.load(src_root)
+                GlobalManifestLoader.load(packages=[src_root])
             except Exception as e:  # noqa
                 yield Precheck.Violation(self, f'Error loading manifest for {src_root}: {e!r}')

{omdev-0.0.0.dev404 → omdev-0.0.0.dev405}/omdev/py/scripts/execstat.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# ruff: noqa: UP045
+# @omlish-lite
 # @omlish-script
 import argparse
 import inspect
@@ -8,6 +10,7 @@ import statistics
 import subprocess
 import sys
 import tempfile
+import typing as ta
 
 
 ##
@@ -16,7 +19,7 @@ import tempfile
 def _run(
         src: str,
         *,
-        setup: str | None = None,
+        setup: 'ta.Optional[str]' = None,
         time: bool = False,
         rss: bool = False,
         modules: bool = False,
@@ -33,8 +36,8 @@ def _run(
     if modules:
         import sys  # noqa
 
-        def get_modules() -> set[str]:
-            return set(sys.modules)
+        def get_modules() -> 'ta.Sequence[str]':
+            return list(sys.modules)
 
     #
 
@@ -51,7 +54,7 @@ def _run(
         start_rss = get_rss()  # noqa
 
     if modules:
-        start_modules = get_modules()  # noqa
+        start_modules = set(get_modules())  # noqa
 
     if time:
         start_time = get_time()  # noqa
@@ -76,7 +79,7 @@ def _run(
     return {
         **({'time': (end_time - start_time)} if time else {}),  # noqa
         **({'rss': (end_rss - start_rss)} if rss else {}),  # noqa
-        **({'modules': sorted(end_modules - start_modules)} if modules else {}),  # noqa
+        **({'modules': [m for m in end_modules if m not in start_modules]} if modules else {}),  # noqa
     }
 
 
@@ -99,6 +102,7 @@ def _main() -> None:
     parser.add_argument('-t', '--time', action='store_true')
     parser.add_argument('-r', '--rss', action='store_true')
     parser.add_argument('-m', '--modules', action='store_true')
+    parser.add_argument('-M', '--modules-ordered', action='store_true')
 
     parser.add_argument('-n', '--num-runs', type=int, default=1)
 
@@ -136,7 +140,7 @@ def _main() -> None:
         if i == 0:
             run_kw.update(
                 rss=bool(args.rss),
-                modules=bool(args.modules),
+                modules=bool(args.modules) or bool(args.modules),
             )
 
         payload = '\n'.join([
@@ -183,7 +187,11 @@ def _main() -> None:
 
     if args.modules:
         out.update({
-            'modules': results[0]['modules'],
+            'modules': sorted(results[0]['modules']),
+        })
+    if args.modules_ordered:
+        out.update({
+            'modules_ordered': results[0]['modules'],
         })
 
     print(json.dumps(out, indent=2))