omdev 0.0.0.dev79__tar.gz → 0.0.0.dev80__tar.gz

{omdev-0.0.0.dev79/omdev.egg-info → omdev-0.0.0.dev80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev79
+Version: 0.0.0.dev80
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev79
+Requires-Dist: omlish==0.0.0.dev80
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev79 → omdev-0.0.0.dev80}/omdev/.manifests.json

@@ -11,6 +11,18 @@
       }
     }
   },
+  {
+    "module": ".bracepy",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/bracepy.py",
+    "line": 88,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "bracepy",
+        "mod_name": "omdev.bracepy"
+      }
+    }
+  },
   {
     "module": ".cexts.cmake",
     "attr": "_CLI_MODULE",
@@ -47,6 +59,30 @@
       }
     }
   },
+  {
+    "module": ".findimports",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/findimports.py",
+    "line": 81,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/findimports",
+        "mod_name": "omdev.findimports"
+      }
+    }
+  },
+  {
+    "module": ".findmagic",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/findmagic.py",
+    "line": 65,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/findmagic",
+        "mod_name": "omdev.findmagic"
+      }
+    }
+  },
   {
     "module": ".imgur",
     "attr": "_FOO_CLI_MODULE",

{omdev-0.0.0.dev79 → omdev-0.0.0.dev80}/omdev/amalg/amalg.py

@@ -24,6 +24,7 @@ Targets:
  - supervisor?
 """
 import argparse
+import ast
 import dataclasses as dc
 import io
 import logging
@@ -297,7 +298,11 @@ def make_src_file(
     tys: list[Typing] = []
     ctls: list[Tokens] = []
 
-    for line in cls:
+    i = 0
+    while i < len(cls):
+        line = cls[i]
+        i += 1
+
         if (imp := make_import(
                 line,
                 src_path=path,
@@ -311,6 +316,31 @@ def make_src_file(
         )) is not None:
             tys.append(ty)
 
+        elif (
+                line and
+                (ft := line[0]).name == 'COMMENT' and
+                ft.src.startswith('# @omlish-manifest')
+        ):
+            mls = [line]
+            while True:
+                mls.append(cls[i])
+                i += 1
+
+                msrc = tks.join_lines(mls).strip()
+                try:
+                    node = ast.parse(msrc)
+                except SyntaxError:
+                    continue
+
+                mmod = check.isinstance(node, ast.Module)
+                check.isinstance(check.single(mmod.body), ast.Assign)
+                break
+
+            ctls.extend([
+                [trt.Token('COMMENT', '# ' + tks.join_toks(ml))]
+                for ml in mls
+            ])
+
         else:
             ctls.append(line)
 

{omdev-0.0.0.dev79 → omdev-0.0.0.dev80}/omdev/bracepy.py

@@ -85,6 +85,13 @@ def translate_brace_python(
     return ret.getvalue()
 
 
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'bracepy',
+    'mod_name': __name__,
+}}
+
+
 if __name__ == '__main__':
     def _main(argv=None) -> None:
         import argparse

{omdev-0.0.0.dev79 → omdev-0.0.0.dev80}/omdev/findimports.py

@@ -78,11 +78,17 @@ def get_import_deps(imps: set[str]) -> set[str]:
     return {i for i in eimps if whichmod(i) != 'builtin'}
 
 
-def _main() -> None:
-    imps = find_imports(*sys.argv[1:])
-    deps = get_import_deps(imps)
-    print(chr(10).join(sorted(deps)))
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'py/findimports',
+    'mod_name': __name__,
+}}
 
 
 if __name__ == '__main__':
+    def _main() -> None:
+        imps = find_imports(*sys.argv[1:])
+        deps = get_import_deps(imps)
+        print(chr(10).join(sorted(deps)))
+
     _main()

{omdev-0.0.0.dev79 → omdev-0.0.0.dev80}/omdev/findmagic.py

@@ -62,6 +62,13 @@ def find_magic(
                 yield out
 
 
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'py/findmagic',
+    'mod_name': __name__,
+}}
+
+
 if __name__ == '__main__':
     def _main(argv=None) -> None:
         import argparse

{omdev-0.0.0.dev79 → omdev-0.0.0.dev80}/omdev/manifests/build.py

@@ -1,7 +1,7 @@
 """
 TODO:
  - separate build from cli
- - parallelize & sort
+ - verify classes instantiate
 
 See (entry_points):
  - https://github.com/pytest-dev/pluggy/blob/main/src/pluggy/_manager.py#L405

{omdev-0.0.0.dev79 → omdev-0.0.0.dev80}/omdev/precheck/__main__.py

@@ -6,6 +6,6 @@ _CLI_MODULE = CliModule('precheck', __name__)
 
 
 if __name__ == '__main__':
-    from .precheck import _main
+    from .main import _main
 
     _main()

{omdev-0.0.0.dev79 → omdev-0.0.0.dev80}/omdev/precheck/lite.py

@@ -10,6 +10,7 @@ import typing as ta
 
 from omdev import findmagic
 from omlish import cached
+from omlish.lite.subprocesses import subprocess_maybe_shell_wrap_exec
 
 from .base import Precheck
 from .base import PrecheckContext
@@ -69,10 +70,12 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
         vs: list[Precheck.Violation] = []
 
         proc = await asyncio.create_subprocess_exec(
-            '.venvs/8/bin/python',
-            '-c',
-            self._load_file_module_payload(),
-            fp,
+            *subprocess_maybe_shell_wrap_exec(
+                '.venvs/8/bin/python',
+                '-c',
+                self._load_file_module_payload(),
+                fp,
+            ),
             stderr=subprocess.PIPE,
         )
 
@@ -90,9 +93,11 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
         log.debug('%s: loading module %s', self.__class__.__name__, mod)
 
         proc = await asyncio.create_subprocess_exec(
-            '.venvs/8/bin/python',
-            '-c',
-            f'import {mod}',
+            *subprocess_maybe_shell_wrap_exec(
+                '.venvs/8/bin/python',
+                '-c',
+                f'import {mod}',
+            ),
             stderr=subprocess.PIPE,
         )
 

omdev-0.0.0.dev79/omdev/precheck/precheck.py → omdev-0.0.0.dev80/omdev/precheck/main.py

@@ -2,7 +2,7 @@
 Tiny pre-commit
 
 TODO:
- - ! manifests
+ - define new prechecks with manifests
  - global config
  - global analyses - FilesWithShebang
  - shebang files have no relative imports
@@ -31,6 +31,7 @@ from .base import Precheck
 from .base import PrecheckContext
 from .git import GitBlacklistPrecheck
 from .lite import LitePython8Precheck
+from .manifests import ManifestsPrecheck
 from .scripts import ScriptDepsPrecheck
 
 
@@ -52,6 +53,7 @@ def _check_cmd(args) -> None:
         GitBlacklistPrecheck(ctx),
         ScriptDepsPrecheck(ctx),
         LitePython8Precheck(ctx),
+        ManifestsPrecheck(ctx),
     ]
 
     async def run() -> list[Precheck.Violation]:
@@ -81,16 +83,18 @@ def _build_parser() -> argparse.ArgumentParser:
 
     parser_check = subparsers.add_parser('check')
     parser_check.add_argument('roots', nargs='+')
+    parser_check.add_argument('-v', '--verbose', action='store_true')
     parser_check.set_defaults(func=_check_cmd)
 
     return parser
 
 
 def _main(argv: ta.Sequence[str] | None = None) -> None:
-    logs.configure_standard_logging('INFO')
-
     parser = _build_parser()
     args = parser.parse_args(argv)
+
+    logs.configure_standard_logging('DEBUG' if args.verbose else 'INFO')
+
     if not getattr(args, 'func', None):
         parser.print_help()
     else:

omdev-0.0.0.dev80/omdev/precheck/manifests.py

@@ -0,0 +1,26 @@
+import dataclasses as dc
+import typing as ta
+
+from ..manifests.load import ManifestLoader
+from .base import Precheck
+from .base import PrecheckContext
+
+
+##
+
+
+class ManifestsPrecheck(Precheck['ManifestsPrecheck.Config']):
+    @dc.dataclass(frozen=True)
+    class Config(Precheck.Config):
+        pass
+
+    def __init__(self, context: PrecheckContext, config: Config = Config()) -> None:
+        super().__init__(context, config)
+
+    async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
+        for src_root in self._context.src_roots:
+            ml = ManifestLoader()
+            try:
+                ml.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.dev79 → omdev-0.0.0.dev80}/omdev/scripts/pyproject.py

@@ -170,6 +170,13 @@ def find_magic(
                 yield out
 
 
+# # @omlish-manifest
+# _CLI_MODULE = {'$omdev.cli.types.CliModule': {
+#     'cmd_name': 'py/findmagic',
+#     'mod_name': __name__,
+# }}
+
+
 ########################################
 # ../../git.py
 

{omdev-0.0.0.dev79 → omdev-0.0.0.dev80/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev79
+Version: 0.0.0.dev80
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev79
+Requires-Dist: omlish==0.0.0.dev80
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev79 → omdev-0.0.0.dev80}/omdev.egg-info/SOURCES.txt

@@ -102,7 +102,8 @@ omdev/precheck/__main__.py
 omdev/precheck/base.py
 omdev/precheck/git.py
 omdev/precheck/lite.py
-omdev/precheck/precheck.py
+omdev/precheck/main.py
+omdev/precheck/manifests.py
 omdev/precheck/scripts.py
 omdev/pyproject/__init__.py
 omdev/pyproject/__main__.py

{omdev-0.0.0.dev79 → omdev-0.0.0.dev80}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev79
+omlish==0.0.0.dev80
 
 [all]
 black~=24.10

{omdev-0.0.0.dev79 → omdev-0.0.0.dev80}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev79'
+version = '0.0.0.dev80'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev79',
+    'omlish == 0.0.0.dev80',
 ]
 
 [project.optional-dependencies]