omdev 0.0.0.dev79__py3-none-any.whl → 0.0.0.dev80__py3-none-any.whl

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/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/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/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/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/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/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/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/precheck/{precheck.py → 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/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/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.dist-info → omdev-0.0.0.dev80.dist-info}/METADATA

@@ -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.dist-info → omdev-0.0.0.dev80.dist-info}/RECORD

@@ -1,11 +1,11 @@
-omdev/.manifests.json,sha256=CGQCoFACCwUKKkXg9CROAN6kW-x0HuQkYKoBVmRXTDU,5246
+omdev/.manifests.json,sha256=TmB_ctSLXsOq5UGeoiGLy5FoI490OCjT2Q2kRWyWG9g,5993
 omdev/__about__.py,sha256=do_MjpnIpB_DX4GL4VV9gFQzs6bkoyDIYu29yB3rYxw,1131
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/bracepy.py,sha256=HwBK5XmlOsF_juTel25fRLJK9vHSJCWXuCc-OZlevRQ,2619
+omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
 omdev/classdot.py,sha256=YOvgy6x295I_8NKBbBlRVd3AN7Osirm_Lqt4Wj0j9rY,1631
 omdev/cmake.py,sha256=Diy2ry65806dQP125DAstD3w46z_wszMH7PwC2-6iik,4578
-omdev/findimports.py,sha256=P8v4I1tm6g-PEWJiNwAKxErvWwL-Nop83vAuwq1kR5A,2246
-omdev/findmagic.py,sha256=DhBYHHP_dzwM5pIh21xnQPnkZ2YmAXCjithsr7X0ScU,2357
+omdev/findimports.py,sha256=2t8QP852saEEJFeXySEzhi_nxRSxghlkXz2jVdvy08M,2392
+omdev/findmagic.py,sha256=XoKPGjSM0qn1PCiiBPwfTHkpqJYQJmLW8v_4QFJ16Mk,2486
 omdev/git.py,sha256=riM2KqSpQPC3N89uipd7Vm3kVgv4EYYDBU9tV1Z8juM,2208
 omdev/imgur.py,sha256=il12R3t19tALolteYCZywvcdQUEOcgvPyUYgWtKiqt4,2993
 omdev/revisions.py,sha256=U657hf4zeEN32y3g4CzqCAodx_HlfkHj2cIIKALNFDo,5009
@@ -14,7 +14,7 @@ omdev/tokens.py,sha256=GusxQ1Cd_eiScuR8XTTtc9QFhOgYviYGBZmFnn3Hj7s,756
 omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=h94M-VqZ3AFBU2a8zOsjeKK7RF6uINhTHl6OiGbVMgw,163
-omdev/amalg/amalg.py,sha256=8tsrsKpgB54aOZ7CPQ6EoUIUYXylMvJpDOOJwbvSZ5E,14339
+omdev/amalg/amalg.py,sha256=v_4Y9b6eUWUArhIRnTkboe8ZNMr_mHJTWi8GajdDvUs,15139
 omdev/antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/antlr/consts.py,sha256=8pR6r0m0P3hAiyiAoJZ-nptd2GYbZ98mxwPL9cpaRuw,279
 omdev/antlr/gen.py,sha256=QnPyVWUrJYqHoOc3XsXA8fJdoiwAj6pyUwdG-DVrIeA,2953
@@ -77,7 +77,7 @@ omdev/interp/standalone.py,sha256=XcltiL7ypcfV89C82_3knQ3Kx7aW4wnnxf2056ZXC3A,77
 omdev/interp/system.py,sha256=bI-JhX4GVJqW7wMxnIa-DGJWnCLmFcIsnl9pc1RGY2g,3513
 omdev/interp/types.py,sha256=EMN3StEMkFoQAMUIZd7JYL4uUWqzFGY-2hTL8EBznYM,2437
 omdev/manifests/__init__.py,sha256=P2B0dpT8D7l5lJwRGPA92IcQj6oeXfd90X5-q9BJrKg,51
-omdev/manifests/build.py,sha256=65Bw8gc8avQdXveKqO6hG25LQjdkXknY3cypojmw7Js,10823
+omdev/manifests/build.py,sha256=omRyKmj4NhZ6PrhmoJIKYCTYaU1OB7bZEtfso29hIEo,10831
 omdev/manifests/load.py,sha256=LtEsluDdd8CkNGj0QGBxee3twBn095Fru0xz2mtr7uk,4788
 omdev/manifests/types.py,sha256=Jv6PAdVLPb9Hh4y6vDhPlWuMNBBViin1bC_u83jfsH4,234
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -88,11 +88,12 @@ omdev/packaging/requires.py,sha256=VQ-rRDK4_w2R-0xMTbLCwhvZwkO-qgS8uEMbRhNmfOw,1
 omdev/packaging/specifiers.py,sha256=6Odf9e6farwlPRsD_YqwTfYKG-BXn_dIcKtqfkhfodI,17432
 omdev/packaging/versions.py,sha256=ei2eopEsJq3zSMJmezK1nzZgikgCdxFtnF3f69nCRZQ,12246
 omdev/precheck/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/precheck/__main__.py,sha256=p8jRkwErGndtO4PO4L5nAC8sqmJ0sW3u-rq8p1GN3ec,169
+omdev/precheck/__main__.py,sha256=UEuS4z5-heIrwTtB-ONe1KeXJdqj8tYXMqWMpuO10so,165
 omdev/precheck/base.py,sha256=a_lGoFM-QhL8u8XDUYFhb-feEyfPbP4j8lcmNO51sHY,732
 omdev/precheck/git.py,sha256=APC5Ln7x0zDrQiGPRWPsBcVJK3vWhbU-brqR5M63JQA,849
-omdev/precheck/lite.py,sha256=MLeDZP2UexNZzYTcSx4-LrhA97kCKn8tXrGkhsJb6I0,3649
-omdev/precheck/precheck.py,sha256=Boe3zbK0RXCGzw9H_OsyqJ4yMETuyrwy8P4UFAZQcTY,2477
+omdev/precheck/lite.py,sha256=d8D-BY-Z0rqQigQ_aR9QXxdB3EBCHJc7WgBJngGiEiE,3871
+omdev/precheck/main.py,sha256=2YizDZSDhMeQaZKVH83s99pBmtOUL9B-8dXwIcw6fQQ,2674
+omdev/precheck/manifests.py,sha256=YfXqt6u0hlFXY0QkBMec6V_6Y9T4eCVAmrJDkQkB13U,774
 omdev/precheck/scripts.py,sha256=qq6MXkxgrYngPg5pWnXH4uRSuRkP3mFqbeml1UmvGBc,1265
 omdev/pyproject/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/pyproject/__main__.py,sha256=gn3Rl1aYPYdiTtEqa9ifi0t-e4ZwPY0vhJ4UXvYdJDY,165
@@ -107,7 +108,7 @@ omdev/scripts/execrss.py,sha256=hJTWBig_-XqKIj1DphYTfeVDtdQTM1XUl-Hvzs2x9iY,451
 omdev/scripts/exectime.py,sha256=dBdn3KV2jR6tCrzGvb9dTl2uGe2vNpLxmHMtExmnaiM,410
 omdev/scripts/importtrace.py,sha256=Jbo3Yk2RAbE8_tJ97iTcVNpoxCJxrRb2tl1W_CV3NG0,14067
 omdev/scripts/interp.py,sha256=2poCQ_45tO0-X16KeoxiAyuTfltSjnPETejlYEm9VY4,71527
-omdev/scripts/pyproject.py,sha256=nWbnMyGwrfzcTcnvUFGP9wxIu3rlUyxQYhkq64UXIrA,158084
+omdev/scripts/pyproject.py,sha256=wtmF5ji8fHw2qzc1aEve09Ozv0ncuZmTQ8IbKCJVAQ0,158223
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/toml/parser.py,sha256=84bn09uhYHwQGyfww6Rw6y1RxPAE_HDltODOSakcqDM,29186
 omdev/toml/writer.py,sha256=lk3on3YXVbWuLJa-xsOzOhs1bBAT1vXqw4mBbluZl_w,3040
@@ -121,9 +122,9 @@ omdev/tools/piptools.py,sha256=-jR5q3w4sHqntxCLExFCBNIARB788FUsAbJ62PK2sBU,2774
 omdev/tools/proftools.py,sha256=8ZU9x_Dq8eT2ZFwU9sJpDIvxcIn9qBc8y2ELKPb5e5M,1382
 omdev/tools/rsttool.py,sha256=suwsfseUf8GH8rYmYygTUdif-Jk_bX1g9fYRLXaKkmM,1340
 omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
-omdev-0.0.0.dev79.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev79.dist-info/METADATA,sha256=sKZ845yEhL8q0_6_dW11F69Rupd9w9mzQ42afWVAvJA,1492
-omdev-0.0.0.dev79.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-omdev-0.0.0.dev79.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev79.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev79.dist-info/RECORD,,
+omdev-0.0.0.dev80.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev80.dist-info/METADATA,sha256=68sUTkl9Uc5f4dvq8nA5q3OQ7eDcDDh0MPClMBFBAps,1492
+omdev-0.0.0.dev80.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+omdev-0.0.0.dev80.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev80.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev80.dist-info/RECORD,,