omdev 0.0.0.dev147__py3-none-any.whl → 0.0.0.dev149__py3-none-any.whl

omdev/manifests/build.py

@@ -1,8 +1,9 @@
 # ruff: noqa: UP006 UP007
+# @omlish-lite
 """
 TODO:
- - separate build from cli
  - verify classes instantiate
+ - embed in pyproject
 
 See (entry_points):
  - https://github.com/pytest-dev/pluggy/blob/main/src/pluggy/_manager.py#L405
@@ -11,14 +12,12 @@ See (entry_points):
  - https://packaging.python.org/en/latest/guides/creating-and-discovering-plugins/
  - [project.entry-points.omlish-manifests] \n omdev = omdev
 """
-import argparse
 import asyncio
 import collections
 import dataclasses as dc
 import inspect
 import itertools
 import json
-import multiprocessing as mp
 import os.path
 import re
 import shlex
@@ -29,7 +28,6 @@ import typing as ta
 
 from omlish.lite.cached import cached_nullary
 from omlish.lite.json import json_dumps_pretty
-from omlish.lite.logs import configure_standard_logging
 from omlish.lite.logs import log
 from omlish.manifests.load import ManifestLoader
 from omlish.manifests.types import Manifest
@@ -282,75 +280,3 @@ def check_package_manifests(
             key = f'${name}{key[1:]}'
         cls = ldr.load_cls(key)
         value = cls(**value_dct)  # noqa
-
-
-##
-
-
-if __name__ == '__main__':
-    def _get_base(args) -> str:
-        if args.base is not None:
-            base = args.base
-        else:
-            base = os.getcwd()
-        base = os.path.abspath(base)
-        if not os.path.isdir(base):
-            raise RuntimeError(base)
-        return base
-
-    def _gen_cmd(args) -> None:
-        base = _get_base(args)
-
-        jobs = args.jobs or int(max(mp.cpu_count() // 1.5, 1))
-        builder = ManifestBuilder(
-            base,
-            jobs,
-            write=args.write or False,
-        )
-
-        async def do():
-            return await asyncio.gather(*[
-                builder.build_package_manifests(pkg)
-                for pkg in args.package
-            ])
-
-        mss = asyncio.run(do())
-        if not args.quiet:
-            for ms in mss:
-                print(json_dumps_pretty([dc.asdict(m) for m in ms]))
-
-    def _check_cmd(args) -> None:
-        base = _get_base(args)
-
-        for pkg in args.package:
-            check_package_manifests(
-                pkg,
-                base,
-            )
-
-    def _main(argv=None) -> None:
-        configure_standard_logging('INFO')
-
-        parser = argparse.ArgumentParser()
-        subparsers = parser.add_subparsers()
-
-        parser_gen = subparsers.add_parser('gen')
-        parser_gen.add_argument('-b', '--base')
-        parser_gen.add_argument('-w', '--write', action='store_true')
-        parser_gen.add_argument('-q', '--quiet', action='store_true')
-        parser_gen.add_argument('-j', '--jobs', type=int)
-        parser_gen.add_argument('package', nargs='*')
-        parser_gen.set_defaults(func=_gen_cmd)
-
-        parser_check = subparsers.add_parser('check')
-        parser_check.add_argument('-b', '--base')
-        parser_check.add_argument('package', nargs='*')
-        parser_check.set_defaults(func=_check_cmd)
-
-        args = parser.parse_args(argv)
-        if not getattr(args, 'func', None):
-            parser.print_help()
-        else:
-            args.func(args)
-
-    _main()

omdev/manifests/main.py

@@ -0,0 +1,84 @@
+import argparse
+import asyncio
+import dataclasses as dc
+import multiprocessing as mp
+import os.path
+
+from omlish.lite.json import json_dumps_pretty
+from omlish.lite.logs import configure_standard_logging
+
+from .build import ManifestBuilder
+from .build import check_package_manifests
+
+
+def _get_base(args) -> str:
+    if args.base is not None:
+        base = args.base
+    else:
+        base = os.getcwd()
+    base = os.path.abspath(base)
+    if not os.path.isdir(base):
+        raise RuntimeError(base)
+    return base
+
+
+def _gen_cmd(args) -> None:
+    base = _get_base(args)
+
+    jobs = args.jobs or int(max(mp.cpu_count() // 1.5, 1))
+    builder = ManifestBuilder(
+        base,
+        jobs,
+        write=args.write or False,
+    )
+
+    async def do():
+        return await asyncio.gather(*[
+            builder.build_package_manifests(pkg)
+            for pkg in args.package
+        ])
+
+    mss = asyncio.run(do())
+    if not args.quiet:
+        for ms in mss:
+            print(json_dumps_pretty([dc.asdict(m) for m in ms]))
+
+
+def _check_cmd(args) -> None:
+    base = _get_base(args)
+
+    for pkg in args.package:
+        check_package_manifests(
+            pkg,
+            base,
+        )
+
+
+def _main(argv=None) -> None:
+    configure_standard_logging('INFO')
+
+    parser = argparse.ArgumentParser()
+    subparsers = parser.add_subparsers()
+
+    parser_gen = subparsers.add_parser('gen')
+    parser_gen.add_argument('-b', '--base')
+    parser_gen.add_argument('-w', '--write', action='store_true')
+    parser_gen.add_argument('-q', '--quiet', action='store_true')
+    parser_gen.add_argument('-j', '--jobs', type=int)
+    parser_gen.add_argument('package', nargs='*')
+    parser_gen.set_defaults(func=_gen_cmd)
+
+    parser_check = subparsers.add_parser('check')
+    parser_check.add_argument('-b', '--base')
+    parser_check.add_argument('package', nargs='*')
+    parser_check.set_defaults(func=_check_cmd)
+
+    args = parser.parse_args(argv)
+    if not getattr(args, 'func', None):
+        parser.print_help()
+    else:
+        args.func(args)
+
+
+if __name__ == '__main__':
+    _main()

omdev/pycharm/cli.py

@@ -13,7 +13,7 @@ import subprocess
 import sys
 import tempfile
 
-from omlish import argparse as ap
+from omlish.argparse import all as ap
 from omlish.diag.pycharm import get_pycharm_version
 
 

omdev/pyproject/cli.py

@@ -21,6 +21,7 @@ See:
  - https://github.com/tox-dev/tox/
 """
 import argparse
+import asyncio
 import concurrent.futures as cf
 import dataclasses as dc
 import functools
@@ -33,6 +34,7 @@ import shutil
 import sys
 import typing as ta
 
+from omlish.lite.cached import async_cached_nullary
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check_not
 from omlish.lite.check import check_not_none
@@ -120,10 +122,10 @@ class Venv:
     def dir_name(self) -> str:
         return os.path.join(self.DIR_NAME, self._name)
 
-    @cached_nullary
-    def interp_exe(self) -> str:
+    @async_cached_nullary
+    async def interp_exe(self) -> str:
         i = InterpSpecifier.parse(check_not_none(self._cfg.interp))
-        return check_not_none(DEFAULT_INTERP_RESOLVER.resolve(i, install=True)).exe
+        return check_not_none(await DEFAULT_INTERP_RESOLVER.resolve(i, install=True)).exe
 
     @cached_nullary
     def exe(self) -> str:
@@ -132,14 +134,14 @@ class Venv:
             raise Exception(f'venv exe {ve} does not exist or is not a file!')
         return ve
 
-    @cached_nullary
-    def create(self) -> bool:
+    @async_cached_nullary
+    async def create(self) -> bool:
         if os.path.exists(dn := self.dir_name):
             if not os.path.isdir(dn):
                 raise Exception(f'{dn} exists but is not a directory!')
             return False
 
-        log.info('Using interpreter %s', (ie := self.interp_exe()))
+        log.info('Using interpreter %s', (ie := await self.interp_exe()))
         subprocess_check_call(ie, '-m', 'venv', dn)
 
         ve = self.exe()
@@ -239,7 +241,7 @@ class Run:
 ##
 
 
-def _venv_cmd(args) -> None:
+async def _venv_cmd(args) -> None:
     venv = Run().venvs()[args.name]
     if (sd := venv.cfg.docker) is not None and sd != (cd := args._docker_container):  # noqa
         script = ' '.join([
@@ -276,10 +278,10 @@ def _venv_cmd(args) -> None:
 
     cmd = args.cmd
     if not cmd:
-        venv.create()
+        await venv.create()
 
     elif cmd == 'python':
-        venv.create()
+        await venv.create()
         os.execl(
             (exe := venv.exe()),
             exe,
@@ -287,12 +289,12 @@ def _venv_cmd(args) -> None:
         )
 
     elif cmd == 'exe':
-        venv.create()
+        await venv.create()
         check_not(args.args)
         print(venv.exe())
 
     elif cmd == 'run':
-        venv.create()
+        await venv.create()
         sh = check_not_none(shutil.which('bash'))
         script = ' '.join(args.args)
         if not script:
@@ -309,7 +311,7 @@ def _venv_cmd(args) -> None:
         print('\n'.join(venv.srcs()))
 
     elif cmd == 'test':
-        venv.create()
+        await venv.create()
         subprocess_check_call(venv.exe(), '-m', 'pytest', *(args.args or []), *venv.srcs())
 
     else:
@@ -319,7 +321,7 @@ def _venv_cmd(args) -> None:
 ##
 
 
-def _pkg_cmd(args) -> None:
+async def _pkg_cmd(args) -> None:
     run = Run()
 
     cmd = args.cmd
@@ -406,7 +408,7 @@ def _build_parser() -> argparse.ArgumentParser:
     return parser
 
 
-def _main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:
+async def _async_main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:
     check_runtime_version()
     configure_standard_logging()
 
@@ -415,7 +417,11 @@ def _main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:
     if not getattr(args, 'func', None):
         parser.print_help()
     else:
-        args.func(args)
+        await args.func(args)
+
+
+def _main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:
+    asyncio.run(_async_main(argv))
 
 
 if __name__ == '__main__':