omdev 0.0.0.dev31__tar.gz → 0.0.0.dev32__tar.gz

{omdev-0.0.0.dev31/omdev.egg-info → omdev-0.0.0.dev32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev31
+Version: 0.0.0.dev32
 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.dev31
+Requires-Dist: omlish==0.0.0.dev32
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

omdev-0.0.0.dev32/omdev/.manifests.json

@@ -0,0 +1,122 @@
+[
+  {
+    "module": ".classdot",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/classdot.py",
+    "line": 62,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "classdot",
+        "mod_name": "omdev.classdot"
+      }
+    }
+  },
+  {
+    "module": ".tools.piptools",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/piptools.py",
+    "line": 51,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "pip",
+        "mod_name": "omdev.tools.piptools"
+      }
+    }
+  },
+  {
+    "module": ".tools.gittools",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/gittools.py",
+    "line": 22,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "git",
+        "mod_name": "omdev.tools.gittools"
+      }
+    }
+  },
+  {
+    "module": ".tools.dockertools",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/dockertools.py",
+    "line": 183,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "docker",
+        "mod_name": "omdev.tools.dockertools"
+      }
+    }
+  },
+  {
+    "module": ".tools.sqlrepl",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/sqlrepl.py",
+    "line": 193,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "sqlrepl",
+        "mod_name": "omdev.tools.sqlrepl"
+      }
+    }
+  },
+  {
+    "module": ".interp.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/interp/__main__.py",
+    "line": 4,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "interp",
+        "mod_name": "omdev.interp.__main__"
+      }
+    }
+  },
+  {
+    "module": ".pyproject.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/pyproject/__main__.py",
+    "line": 4,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "pyproject",
+        "mod_name": "omdev.pyproject.__main__"
+      }
+    }
+  },
+  {
+    "module": ".cexts.cmake",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/cexts/cmake.py",
+    "line": 323,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "cmake",
+        "mod_name": "omdev.cexts.cmake"
+      }
+    }
+  },
+  {
+    "module": ".precheck.precheck",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/precheck/precheck.py",
+    "line": 90,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "precheck",
+        "mod_name": "omdev.precheck.precheck"
+      }
+    }
+  },
+  {
+    "module": ".amalg.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/amalg/__main__.py",
+    "line": 4,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "amalg",
+        "mod_name": "omdev.amalg.__main__"
+      }
+    }
+  }
+]

{omdev-0.0.0.dev31 → omdev-0.0.0.dev32}/omdev/__about__.py

@@ -35,6 +35,15 @@ class Project(ProjectBase):
         ],
     }
 
+    entry_points = {
+        'omlish.manifests': {name: name},
+    }
+
+    # FIXME: omdev-cli ?
+    # scripts = {
+    #     'om': f'{name}.cli.main:_main [cli]',
+    # }
+
 
 class Setuptools(SetuptoolsBase):
     cexts = True

omdev-0.0.0.dev32/omdev/amalg/__main__.py

@@ -0,0 +1,11 @@
+from ..cli import CliModule
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('amalg', __name__)
+
+
+if __name__ == '__main__':
+    from .amalg import _main
+
+    _main()

{omdev-0.0.0.dev31 → omdev-0.0.0.dev32}/omdev/amalg/amalg.py

@@ -4,9 +4,9 @@ Conventions:
  - must import 'from' items for local modules
 
 TODO:
- - check 3.8 compat
+ - !! strip manifests? or relegate them to a separate tiny module ala __main__.py?
+  - # @omlish-no-amalg ? in cli.types? will strip stmt (more than 1 line) following @manifest, so shouldn't import
  - more sanity checks lol
- - flake8 / ruff mgmt
  - typealias - support # noqa, other comments, and lamely support multiline by just stealing lines till it parses
  - remove `if __name__ == '__main__':` blocks - thus, convention: no def _main() for these
 
@@ -339,8 +339,8 @@ RUFF_DISABLES: ta.AbstractSet[str] = {
     'UP036',  # outdated-version-block
 }
 
-OUTPUT_COMMENT = '# @omdev-amalg-output '
-SCAN_COMMENT = '# @omdev-amalg '
+OUTPUT_COMMENT = '# @omlish-amalg-output '
+SCAN_COMMENT = '# @omlish-amalg '
 
 
 def gen_amalg(

{omdev-0.0.0.dev31 → omdev-0.0.0.dev32}/omdev/cexts/_boilerplate.cc

@@ -1,4 +1,4 @@
-// @omdev-cext
+// @omlish-cext
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "structmember.h"

{omdev-0.0.0.dev31 → omdev-0.0.0.dev32}/omdev/cexts/cmake.py

@@ -38,6 +38,7 @@ from omlish import logs
 
 from .. import cmake
 from .. import findmagic
+from ..cli import CliModule
 from .magic import CextMagic
 
 
@@ -319,6 +320,10 @@ def _gen_cmd(args) -> None:
     cpg.run()
 
 
+# @omlish-manifest
+_CLI_MODULE = CliModule('cmake', __name__)
+
+
 def _main(argv=None) -> None:
     logs.configure_standard_logging('INFO')
 

{omdev-0.0.0.dev31 → omdev-0.0.0.dev32}/omdev/cexts/magic.py

@@ -1,7 +1,7 @@
 # @omlish-lite
 
 class CextMagic:
-    MAGIC = '@omdev-cext'
+    MAGIC = '@omlish-cext'
     MAGIC_COMMENT = f'// {MAGIC}'
 
     FILE_EXTENSIONS = ('c', 'cc', 'cpp')

{omdev-0.0.0.dev31 → omdev-0.0.0.dev32}/omdev/classdot.py

@@ -7,6 +7,8 @@ import typing as ta
 
 from omlish.graphs import dot
 
+from .cli import CliModule
+
 
 def gen_class_dot(roots: ta.Iterable[type]) -> dot.Graph:
     roots = set(roots)
@@ -57,5 +59,9 @@ def _main() -> None:
     dot.open_dot(dot.render(scd), sleep_s=1.)
 
 
+# @omlish-manifest
+_CLI_MODULE = CliModule('classdot', __name__)
+
+
 if __name__ == '__main__':
     _main()

omdev-0.0.0.dev32/omdev/cli/__init__.py

@@ -0,0 +1 @@
+from .types import CliModule  # noqa

{omdev-0.0.0.dev31/omdev/pyproject → omdev-0.0.0.dev32/omdev/cli}/__main__.py

@@ -1,4 +1,4 @@
 if __name__ == '__main__':
-    from .cli import _main
+    from .main import _main
 
     _main()

omdev-0.0.0.dev32/omdev/cli/main.py

@@ -0,0 +1,59 @@
+"""
+TODO:
+ - allow manually specifying manifest packages
+ - omlish.bootstrap always
+ - https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#creating-executable-scripts
+ - https://packaging.python.org/en/latest/specifications/entry-points/#entry-points
+"""
+import argparse
+import functools
+import os
+import runpy
+import sys
+
+from omlish import check
+
+from ..manifests.load import ManifestLoader
+from .types import CliModule
+
+
+def _main() -> None:
+    cms: list[CliModule] = []
+
+    ldr = ManifestLoader.from_entry_point(globals())
+
+    pkgs = ldr.discover()
+    if not pkgs:
+        pkgs = []
+        for n in os.listdir(os.getcwd()):
+            if os.path.isdir(n) and os.path.exists(os.path.join(n, '__init__.py')):
+                pkgs.append(n)
+
+    for m in ldr.load(*pkgs, only=[CliModule]):
+        cms.append(check.isinstance(m.value, CliModule))
+
+    parser = argparse.ArgumentParser()
+    subparsers = parser.add_subparsers()
+
+    def run(cm: CliModule) -> None:
+        sys.argv = [cm.cmd_name, *(args.args or ())]
+        runpy._run_module_as_main(cm.mod_name)  # type: ignore  # noqa
+
+    seen: set[str] = set()
+    for cm in cms:
+        if cm.cmd_name in seen:
+            raise NameError(cm)
+
+        cmd_parser = subparsers.add_parser(cm.cmd_name)
+        cmd_parser.add_argument('args', nargs=argparse.REMAINDER)
+        cmd_parser.set_defaults(func=functools.partial(run, cm))
+
+    args = parser.parse_args()
+    if not getattr(args, 'func', None):
+        parser.print_help()
+    else:
+        args.func()
+
+
+if __name__ == '__main__':
+    _main()

omdev-0.0.0.dev32/omdev/cli/types.py

@@ -0,0 +1,7 @@
+import dataclasses as dc
+
+
+@dc.dataclass(frozen=True)
+class CliModule:
+    cmd_name: str
+    mod_name: str

omdev-0.0.0.dev32/omdev/interp/__main__.py

@@ -0,0 +1,11 @@
+from ..cli import CliModule
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('interp', __name__)
+
+
+if __name__ == '__main__':
+    from .cli import _main
+
+    _main()

{omdev-0.0.0.dev31 → omdev-0.0.0.dev32}/omdev/interp/cli.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# @omdev-amalg ../scripts/interp.py
+# @omlish-amalg ../scripts/interp.py
 # ruff: noqa: UP007
 """
 TODO:
@@ -15,6 +15,8 @@ from omlish.lite.logs import configure_standard_logging
 from omlish.lite.runtime import check_runtime_version
 
 from .resolvers import DEFAULT_INTERP_RESOLVER
+from .resolvers import INTERP_PROVIDER_TYPES_BY_NAME
+from .resolvers import InterpResolver
 from .types import InterpSpecifier
 
 
@@ -25,9 +27,13 @@ def _list_cmd(args) -> None:
 
 
 def _resolve_cmd(args) -> None:
-    r = DEFAULT_INTERP_RESOLVER
+    if args.provider:
+        p = INTERP_PROVIDER_TYPES_BY_NAME[args.provider]()
+        r = InterpResolver([(p.name, p)])
+    else:
+        r = DEFAULT_INTERP_RESOLVER
     s = InterpSpecifier.parse(args.version)
-    print(check_not_none(r.resolve(s)).exe)
+    print(check_not_none(r.resolve(s, install=bool(args.install))).exe)
 
 
 def _build_parser() -> argparse.ArgumentParser:
@@ -37,12 +43,14 @@ def _build_parser() -> argparse.ArgumentParser:
 
     parser_list = subparsers.add_parser('list')
     parser_list.add_argument('version')
-    parser_list.add_argument('--debug', action='store_true')
+    parser_list.add_argument('-d', '--debug', action='store_true')
     parser_list.set_defaults(func=_list_cmd)
 
     parser_resolve = subparsers.add_parser('resolve')
     parser_resolve.add_argument('version')
-    parser_resolve.add_argument('--debug', action='store_true')
+    parser_resolve.add_argument('-p', '--provider')
+    parser_resolve.add_argument('-d', '--debug', action='store_true')
+    parser_resolve.add_argument('-i', '--install', action='store_true')
     parser_resolve.set_defaults(func=_resolve_cmd)
 
     return parser

{omdev-0.0.0.dev31 → omdev-0.0.0.dev32}/omdev/interp/pyenv.py

@@ -1,16 +1,14 @@
 """
 TODO:
  - custom tags
+  - 'aliases'
+  - https://github.com/pyenv/pyenv/pull/2966
+  - https://github.com/pyenv/pyenv/issues/218 (lol)
+  - probably need custom (temp?) definition file
+  - *or* python-build directly just into the versions dir?
  - optionally install / upgrade pyenv itself
  - new vers dont need these custom mac opts, only run on old vers
-
-TODO opts:
- - --enable-loadable-sqlite-extensions LDFLAGS="-L/opt/homebrew/opt/sqlite/lib" CPPFLAGS="-I/opt/homebrew/opt/sqlite/include"
- - --enable-shared
- - --enable-optimizations
- - --enable-profiling ?
- - --enable-ipv6 ?
-"""  # noqa
+"""
 # ruff: noqa: UP006 UP007
 import abc
 import dataclasses as dc
@@ -129,8 +127,33 @@ class PyenvInstallOpts:
         )
 
 
-DEFAULT_PYENV_INSTALL_OPTS = PyenvInstallOpts(opts=['-s', '-v'])
+# TODO: https://github.com/pyenv/pyenv/blob/master/plugins/python-build/README.md#building-for-maximum-performance
+DEFAULT_PYENV_INSTALL_OPTS = PyenvInstallOpts(
+    opts=[
+        '-s',
+        '-v',
+        '-k',
+    ],
+    conf_opts=[
+        '--enable-loadable-sqlite-extensions',
+
+        # '--enable-shared',
+
+        '--enable-optimizations',
+        '--with-lto',
+
+        # '--enable-profiling', # ?
+
+        # '--enable-ipv6', # ?
+    ],
+    cflags=[
+        # '-march=native',
+        # '-mtune=native',
+    ],
+)
+
 DEBUG_PYENV_INSTALL_OPTS = PyenvInstallOpts(opts=['-g'])
+
 THREADED_PYENV_INSTALL_OPTS = PyenvInstallOpts(conf_opts=['--disable-gil'])
 
 
@@ -229,6 +252,7 @@ class PyenvVersionInstaller:
             opts: ta.Optional[PyenvInstallOpts] = None,
             interp_opts: InterpOpts = InterpOpts(),
             *,
+            install_name: ta.Optional[str] = None,
             no_default_opts: bool = False,
             pyenv: Pyenv = Pyenv(),
     ) -> None:
@@ -249,6 +273,7 @@ class PyenvVersionInstaller:
         self._version = version
         self._opts = opts
         self._interp_opts = interp_opts
+        self._given_install_name = install_name
 
         self._no_default_opts = no_default_opts
         self._pyenv = pyenv
@@ -263,6 +288,8 @@ class PyenvVersionInstaller:
 
     @cached_nullary
     def install_name(self) -> str:
+        if self._given_install_name is not None:
+            return self._given_install_name
         return self._version + ('-debug' if self._interp_opts.debug else '')
 
     @cached_nullary
@@ -282,11 +309,26 @@ class PyenvVersionInstaller:
                 v += ' ' + os.environ[k]
             env[k] = v
 
-        subprocess_check_call(
-            self._pyenv.exe(),
-            'install',
+        conf_args = [
             *self._opts.opts,
             self._version,
+        ]
+
+        if self._given_install_name is not None:
+            full_args = [
+                os.path.join(check_not_none(self._pyenv.root()), 'plugins', 'python-build', 'bin', 'python-build'),
+                *conf_args,
+                self.install_dir(),
+            ]
+        else:
+            full_args = [
+                self._pyenv.exe(),
+                'install',
+                *conf_args,
+            ]
+
+        subprocess_check_call(
+            *full_args,
             env=env,
         )
 

omdev-0.0.0.dev32/omdev/manifests/__init__.py

@@ -0,0 +1,2 @@
+# @omlish-lite
+from .types import Manifest  # noqa

omdev-0.0.0.dev31/omdev/manifests.py → omdev-0.0.0.dev32/omdev/manifests/build.py

@@ -1,15 +1,18 @@
 """
 TODO:
- - split, cli.py / types.py
- - opt to load only specified types
- - prechecks
+ - relative keys - if startswith self pkg then `$.foo.bar`
+
+- See (entry_points):
+ - https://github.com/pytest-dev/pluggy/blob/main/src/pluggy/_manager.py#L405
+ - https://docs.pytest.org/en/7.1.x/how-to/writing_plugins.html#setuptools-entry-points
+ - https://packaging.python.org/en/latest/specifications/entry-points/
+ - https://packaging.python.org/en/latest/guides/creating-and-discovering-plugins/
+ - [project.entry-points.omlish-manifests] \n omdev = omdev
 """
 # ruff: noqa: UP006 UP007
-# @omlish-lite
 import argparse
 import collections
 import dataclasses as dc
-import importlib
 import inspect
 import json
 import os.path
@@ -25,57 +28,10 @@ from omlish.lite.json import json_dumps_pretty
 from omlish.lite.logs import configure_standard_logging
 from omlish.lite.logs import log
 
-from . import findmagic
-
-
-##
-
-
-@dc.dataclass(frozen=True)
-class ManifestOrigin:
-    module: str
-    attr: str
-
-    file: str
-    line: int
-
-
-@dc.dataclass(frozen=True)
-class Manifest(ManifestOrigin):
-    value: ta.Any
-
-
-def load_manifest_entry(
-        entry: ta.Mapping[str, ta.Any],
-        *,
-        raw_values: bool = False,
-) -> Manifest:
-    manifest = Manifest(**entry)
-
-    [(key, value_dct)] = manifest.value.items()
-    if not key.startswith('$'):
-        raise Exception(f'Bad key: {key}')
-
-    if not raw_values:
-        parts = key[1:].split('.')
-        pos = next(i for i, p in enumerate(parts) if p[0].isupper())
-        mod_name = '.'.join(parts[:pos])
-        mod = importlib.import_module(mod_name)
-
-        obj: ta.Any = mod
-        for ca in parts[pos:]:
-            obj = getattr(obj, ca)
-        cls = obj
-        if not isinstance(cls, type):
-            raise TypeError(cls)
-
-        if not dc.is_dataclass(cls):
-            raise TypeError(cls)
-        obj = cls(**value_dct)  # noqa
-
-        manifest = dc.replace(manifest, value=obj)
-
-    return manifest
+from .. import findmagic
+from .load import ManifestLoader
+from .types import Manifest
+from .types import ManifestOrigin
 
 
 ##
@@ -218,9 +174,16 @@ def build_module_manifests(
 
         if not (
                 isinstance(value, ta.Mapping) and
+                len(value) == 1 and
                 all(isinstance(k, str) and k.startswith('$') and len(k) > 1 for k in value)
         ):
-            raise TypeError(f'Manifests must be mapping of strings starting with $: {value!r}')
+            raise TypeError(f'Manifests must be mappings of strings starting with $: {value!r}')
+
+        [(key, value_dct)] = value.items()
+        kb, _, kr = key[1:].partition('.')  # noqa
+        if kb == mod_base:  # noqa
+            key = f'$.{kr}'
+            value = {key: value_dct}
 
         out.append(Manifest(
             **dc.asdict(o),
@@ -275,8 +238,14 @@ def check_package_manifests(
     with open(manifests_file) as f:
         manifests_json = json.load(f)
 
+    ldr = ManifestLoader()
     for entry in manifests_json:
-        load_manifest_entry(entry)
+        manifest = Manifest(**entry)
+        [(key, value_dct)] = manifest.value.items()
+        if key.startswith('$.'):
+            key = f'${name}{key[1:]}'
+        cls = ldr.load_cls(key)
+        value = cls(**value_dct)  # noqa
 
 
 ##