omdev 0.0.0.dev7__tar.gz → 0.0.0.dev10__tar.gz

{omdev-0.0.0.dev7/omdev.egg-info → omdev-0.0.0.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev7
+Version: 0.0.0.dev10
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,13 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev7
+Requires-Dist: omlish==0.0.0.dev10
+Provides-Extra: all
+Requires-Dist: pycparser>=2.22; extra == "all"
+Requires-Dist: cffi>=1.17; extra == "all"
+Requires-Dist: pcpp>=1.30; extra == "all"
+Requires-Dist: mypy>=1.11; extra == "all"
+Requires-Dist: tokenize_rt>=6; extra == "all"
 Provides-Extra: c
 Requires-Dist: pycparser>=2.22; extra == "c"
 Requires-Dist: cffi>=1.17; extra == "c"

{omdev-0.0.0.dev7 → omdev-0.0.0.dev10}/omdev/__about__.py

@@ -30,6 +30,6 @@ class Project(ProjectBase):
 
 class Setuptools(SetuptoolsBase):
     find_packages = {
-        'include': ['omdev', 'omdev.*'],
+        'include': [Project.name, f'{Project.name}.*'],
         'exclude': [*SetuptoolsBase.find_packages['exclude']],
     }

{omdev-0.0.0.dev7 → omdev-0.0.0.dev10}/omdev/pyproject/cli.py

@@ -21,7 +21,9 @@ lookit:
  - https://github.com/tox-dev/tox/
 """
 import argparse
+import concurrent.futures as cf
 import dataclasses as dc
+import functools
 import glob
 import itertools
 import os.path
@@ -44,6 +46,7 @@ from ..toml.parser import toml_loads
 from .configs import PyprojectConfig
 from .configs import PyprojectConfigPreparer
 from .configs import VenvConfig
+from .pkg import PyprojectPackageGenerator
 
 
 ##
@@ -287,6 +290,49 @@ def _venv_cmd(args) -> None:
 ##
 
 
+def _pkg_cmd(args) -> None:
+    run = Run()
+
+    cmd = args.cmd
+    if not cmd:
+        raise Exception('must specify command')
+
+    elif cmd == 'gen':
+        build_root = os.path.join('.pkg')
+
+        if os.path.exists(build_root):
+            shutil.rmtree(build_root)
+
+        build_output_dir = 'dist'
+        run_build = bool(args.build)
+
+        num_threads = 8
+
+        if run_build:
+            os.makedirs(build_output_dir, exist_ok=True)
+
+        with cf.ThreadPoolExecutor(num_threads) as ex:
+            futs = [
+                ex.submit(functools.partial(
+                    PyprojectPackageGenerator(
+                        dir_name,
+                        build_root,
+                    ).gen,
+                    run_build=run_build,
+                    build_output_dir=build_output_dir,
+                ))
+                for dir_name in run.cfg().pkgs
+            ]
+            for fut in futs:
+                fut.result()
+
+    else:
+        raise Exception(f'unknown subcommand: {cmd}')
+
+
+##
+
+
 def _build_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser()
     parser.add_argument('--_docker_container', help=argparse.SUPPRESS)
@@ -300,6 +346,12 @@ def _build_parser() -> argparse.ArgumentParser:
     parser_resolve.add_argument('args', nargs=argparse.REMAINDER)
     parser_resolve.set_defaults(func=_venv_cmd)
 
+    parser_resolve = subparsers.add_parser('pkg')
+    parser_resolve.add_argument('-b', '--build', action='store_true')
+    parser_resolve.add_argument('cmd', nargs='?')
+    parser_resolve.add_argument('args', nargs=argparse.REMAINDER)
+    parser_resolve.set_defaults(func=_pkg_cmd)
+
     return parser
 
 

{omdev-0.0.0.dev7 → omdev-0.0.0.dev10}/omdev/pyproject/configs.py

@@ -16,8 +16,9 @@ class VenvConfig:
 
 @dc.dataclass(frozen=True)
 class PyprojectConfig:
-    srcs: ta.Mapping[str, ta.Sequence[str]]
-    venvs: ta.Mapping[str, VenvConfig]
+    pkgs: ta.Sequence[str] = dc.field(default_factory=list)
+    srcs: ta.Mapping[str, ta.Sequence[str]] = dc.field(default_factory=dict)
+    venvs: ta.Mapping[str, VenvConfig] = dc.field(default_factory=dict)
 
     venvs_dir: str = '.venvs'
     versions_file: ta.Optional[str] = '.versions'

{omdev-0.0.0.dev7 → omdev-0.0.0.dev10}/omdev/pyproject/pkg.py

@@ -27,6 +27,7 @@ import types
 import typing as ta
 
 from omlish.lite.cached import cached_nullary
+from omlish.lite.logs import log
 
 from ..toml.writer import TomlWriter
 
@@ -114,6 +115,8 @@ class PyprojectPackageGenerator:
     def file_contents(self) -> FileContents:
         pyp_dct = {}
 
+        #
+
         pyp_dct['build-system'] = {
             'requires': ['setuptools'],
             'build-backend': 'setuptools.build_meta',
@@ -121,14 +124,29 @@ class PyprojectPackageGenerator:
 
         prj = self._build_cls_dct(self.project_cls())
         pyp_dct['project'] = prj
-        self._move_dict_key(prj, 'optional_dependencies', pyp_dct, 'project.optional-dependencies')
+
+        self._move_dict_key(prj, 'optional_dependencies', pyp_dct, extrask := 'project.optional-dependencies')
+        if (extras := pyp_dct.get(extrask)):
+            pyp_dct[extrask] = {
+                'all': [
+                    e
+                    for lst in extras.values()
+                    for e in lst
+                ],
+                **extras,
+            }
+
+        #
 
         st = self._build_cls_dct(self.setuptools_cls())
         pyp_dct['tool.setuptools'] = st
+
         self._move_dict_key(st, 'find_packages', pyp_dct, 'tool.setuptools.packages.find')
 
         mani_in = st.pop('manifest_in', None)
 
+        #
+
         return self.FileContents(
             pyp_dct,
             mani_in,
@@ -184,6 +202,8 @@ class PyprojectPackageGenerator:
             run_build: bool = False,
             build_output_dir: ta.Optional[str] = None,
     ) -> str:
+        log.info('Generating pyproject package: %s -> %s', self._dir_name, self._build_root)
+
         self._build_dir()
         self._write_git_ignore()
         self._symlink_source_dir()

{omdev-0.0.0.dev7 → omdev-0.0.0.dev10}/omdev/scripts/interp.py

@@ -12,6 +12,7 @@ import abc
 import argparse
 import collections
 import dataclasses as dc
+import datetime
 import functools
 import inspect
 import itertools
@@ -24,6 +25,7 @@ import shlex
 import shutil
 import subprocess
 import sys
+import threading
 import typing as ta
 
 
@@ -1134,14 +1136,28 @@ class SpecifierSet(BaseSpecifier):
 # ../../../omlish/lite/logs.py
 """
 TODO:
+ - translate json keys
  - debug
 """
-# ruff: noqa: UP007
+# ruff: noqa: UP006 UP007 N802
 
 
 log = logging.getLogger(__name__)
 
 
+##
+
+
+class TidLogFilter(logging.Filter):
+
+    def filter(self, record):
+        record.tid = threading.get_native_id()
+        return True
+
+
+##
+
+
 class JsonLogFormatter(logging.Formatter):
 
     KEYS: ta.Mapping[str, bool] = {
@@ -1177,9 +1193,62 @@ class JsonLogFormatter(logging.Formatter):
         return json_dumps_compact(dct)
 
 
-def configure_standard_logging(level: ta.Union[int, str] = logging.INFO) -> None:
-    logging.root.addHandler(logging.StreamHandler())
-    logging.root.setLevel(level)
+##
+
+
+STANDARD_LOG_FORMAT_PARTS = [
+    ('asctime', '%(asctime)-15s'),
+    ('process', 'pid=%(process)-6s'),
+    ('thread', 'tid=%(thread)-16s'),
+    ('levelname', '%(levelname)-8s'),
+    ('name', '%(name)s'),
+    ('separator', '::'),
+    ('message', '%(message)s'),
+]
+
+
+class StandardLogFormatter(logging.Formatter):
+
+    @staticmethod
+    def build_log_format(parts: ta.Iterable[ta.Tuple[str, str]]) -> str:
+        return ' '.join(v for k, v in parts)
+
+    converter = datetime.datetime.fromtimestamp  # type: ignore
+
+    def formatTime(self, record, datefmt=None):
+        ct = self.converter(record.created)  # type: ignore
+        if datefmt:
+            return ct.strftime(datefmt)  # noqa
+        else:
+            t = ct.strftime("%Y-%m-%d %H:%M:%S")  # noqa
+            return '%s.%03d' % (t, record.msecs)
+
+
+##
+
+
+def configure_standard_logging(
+        level: ta.Union[int, str] = logging.INFO,
+        *,
+        json: bool = False,
+) -> logging.Handler:
+    handler = logging.StreamHandler()
+
+    formatter: logging.Formatter
+    if json:
+        formatter = JsonLogFormatter()
+    else:
+        formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+    handler.setFormatter(formatter)
+
+    handler.addFilter(TidLogFilter())
+
+    logging.root.addHandler(handler)
+
+    if level is not None:
+        logging.root.setLevel(level)
+
+    return handler
 
 
 ########################################

{omdev-0.0.0.dev7 → omdev-0.0.0.dev10}/omdev/scripts/pyproject.py

@@ -26,6 +26,7 @@ import argparse
 import base64
 import collections
 import collections.abc
+import concurrent.futures as cf
 import dataclasses as dc
 import datetime
 import decimal
@@ -33,6 +34,7 @@ import enum
 import fractions
 import functools
 import glob
+import importlib
 import inspect
 import itertools
 import json
@@ -45,6 +47,7 @@ import shutil
 import string
 import subprocess
 import sys
+import threading
 import types
 import typing as ta
 import uuid
@@ -882,6 +885,112 @@ def toml_make_safe_parse_float(parse_float: TomlParseFloat) -> TomlParseFloat:
     return safe_parse_float
 
 
+########################################
+# ../../toml/writer.py
+
+
+class TomlWriter:
+    def __init__(self, out: ta.TextIO) -> None:
+        super().__init__()
+        self._out = out
+
+        self._indent = 0
+        self._wrote_indent = False
+
+    #
+
+    def _w(self, s: str) -> None:
+        if not self._wrote_indent:
+            self._out.write('    ' * self._indent)
+            self._wrote_indent = True
+        self._out.write(s)
+
+    def _nl(self) -> None:
+        self._out.write('\n')
+        self._wrote_indent = False
+
+    def _needs_quote(self, s: str) -> bool:
+        return (
+            not s or
+            any(c in s for c in '\'"\n') or
+            s[0] not in string.ascii_letters
+        )
+
+    def _maybe_quote(self, s: str) -> str:
+        if self._needs_quote(s):
+            return repr(s)
+        else:
+            return s
+
+    #
+
+    def write_root(self, obj: ta.Mapping) -> None:
+        for i, (k, v) in enumerate(obj.items()):
+            if i:
+                self._nl()
+            self._w('[')
+            self._w(self._maybe_quote(k))
+            self._w(']')
+            self._nl()
+            self.write_table_contents(v)
+
+    def write_table_contents(self, obj: ta.Mapping) -> None:
+        for k, v in obj.items():
+            self.write_key(k)
+            self._w(' = ')
+            self.write_value(v)
+            self._nl()
+
+    def write_array(self, obj: ta.Sequence) -> None:
+        self._w('[')
+        self._nl()
+        self._indent += 1
+        for e in obj:
+            self.write_value(e)
+            self._w(',')
+            self._nl()
+        self._indent -= 1
+        self._w(']')
+
+    def write_inline_table(self, obj: ta.Mapping) -> None:
+        self._w('{')
+        for i, (k, v) in enumerate(obj.items()):
+            if i:
+                self._w(', ')
+            self.write_key(k)
+            self._w(' = ')
+            self.write_value(v)
+        self._w('}')
+
+    def write_inline_array(self, obj: ta.Sequence) -> None:
+        self._w('[')
+        for i, e in enumerate(obj):
+            if i:
+                self._w(', ')
+            self.write_value(e)
+        self._w(']')
+
+    def write_key(self, obj: ta.Any) -> None:
+        if isinstance(obj, str):
+            self._w(self._maybe_quote(obj.replace('_', '-')))
+        elif isinstance(obj, int):
+            self._w(repr(str(obj)))
+        else:
+            raise TypeError(obj)
+
+    def write_value(self, obj: ta.Any) -> None:
+        if isinstance(obj, bool):
+            self._w(str(obj).lower())
+        elif isinstance(obj, (str, int, float)):
+            self._w(repr(obj))
+        elif isinstance(obj, ta.Mapping):
+            self.write_inline_table(obj)
+        elif isinstance(obj, ta.Sequence):
+            self.write_array(obj)
+        else:
+            raise TypeError(obj)
+
+
 ########################################
 # ../../versioning/versions.py
 # Copyright (c) Donald Stufft and individual contributors.
@@ -1977,14 +2086,28 @@ class SpecifierSet(BaseSpecifier):
 # ../../../omlish/lite/logs.py
 """
 TODO:
+ - translate json keys
  - debug
 """
-# ruff: noqa: UP007
+# ruff: noqa: UP006 UP007 N802
 
 
 log = logging.getLogger(__name__)
 
 
+##
+
+
+class TidLogFilter(logging.Filter):
+
+    def filter(self, record):
+        record.tid = threading.get_native_id()
+        return True
+
+
+##
+
+
 class JsonLogFormatter(logging.Formatter):
 
     KEYS: ta.Mapping[str, bool] = {
@@ -2020,9 +2143,62 @@ class JsonLogFormatter(logging.Formatter):
         return json_dumps_compact(dct)
 
 
-def configure_standard_logging(level: ta.Union[int, str] = logging.INFO) -> None:
-    logging.root.addHandler(logging.StreamHandler())
-    logging.root.setLevel(level)
+##
+
+
+STANDARD_LOG_FORMAT_PARTS = [
+    ('asctime', '%(asctime)-15s'),
+    ('process', 'pid=%(process)-6s'),
+    ('thread', 'tid=%(thread)-16s'),
+    ('levelname', '%(levelname)-8s'),
+    ('name', '%(name)s'),
+    ('separator', '::'),
+    ('message', '%(message)s'),
+]
+
+
+class StandardLogFormatter(logging.Formatter):
+
+    @staticmethod
+    def build_log_format(parts: ta.Iterable[ta.Tuple[str, str]]) -> str:
+        return ' '.join(v for k, v in parts)
+
+    converter = datetime.datetime.fromtimestamp  # type: ignore
+
+    def formatTime(self, record, datefmt=None):
+        ct = self.converter(record.created)  # type: ignore
+        if datefmt:
+            return ct.strftime(datefmt)  # noqa
+        else:
+            t = ct.strftime("%Y-%m-%d %H:%M:%S")  # noqa
+            return '%s.%03d' % (t, record.msecs)
+
+
+##
+
+
+def configure_standard_logging(
+        level: ta.Union[int, str] = logging.INFO,
+        *,
+        json: bool = False,
+) -> logging.Handler:
+    handler = logging.StreamHandler()
+
+    formatter: logging.Formatter
+    if json:
+        formatter = JsonLogFormatter()
+    else:
+        formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+    handler.setFormatter(formatter)
+
+    handler.addFilter(TidLogFilter())
+
+    logging.root.addHandler(handler)
+
+    if level is not None:
+        logging.root.setLevel(level)
+
+    return handler
 
 
 ########################################
@@ -2030,6 +2206,7 @@ def configure_standard_logging(level: ta.Union[int, str] = logging.INFO) -> None
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
+ - nonstrict toggle
 """
 # ruff: noqa: UP006 UP007
 
@@ -2151,12 +2328,13 @@ class IterableObjMarshaler(ObjMarshaler):
 class DataclassObjMarshaler(ObjMarshaler):
     ty: type
     fs: ta.Mapping[str, ObjMarshaler]
+    nonstrict: bool = False
 
     def marshal(self, o: ta.Any) -> ta.Any:
         return {k: m.marshal(getattr(o, k)) for k, m in self.fs.items()}
 
     def unmarshal(self, o: ta.Any) -> ta.Any:
-        return self.ty(**{k: self.fs[k].unmarshal(v) for k, v in o.items()})
+        return self.ty(**{k: self.fs[k].unmarshal(v) for k, v in o.items() if self.nonstrict or k in self.fs})
 
 
 @dc.dataclass(frozen=True)
@@ -2447,8 +2625,9 @@ class VenvConfig:
 
 @dc.dataclass(frozen=True)
 class PyprojectConfig:
-    srcs: ta.Mapping[str, ta.Sequence[str]]
-    venvs: ta.Mapping[str, VenvConfig]
+    pkgs: ta.Sequence[str] = dc.field(default_factory=list)
+    srcs: ta.Mapping[str, ta.Sequence[str]] = dc.field(default_factory=dict)
+    venvs: ta.Mapping[str, VenvConfig] = dc.field(default_factory=dict)
 
     venvs_dir: str = '.venvs'
     versions_file: ta.Optional[str] = '.versions'
@@ -2528,6 +2707,213 @@ class PyprojectConfigPreparer:
         return pcfg
 
 
+########################################
+# ../pkg.py
+"""
+TODO:
+ - ext scanning
+ - __revision__
+ - entry_points
+
+https://setuptools.pypa.io/en/latest/references/keywords.html
+https://packaging.python.org/en/latest/specifications/pyproject-toml
+
+How to build a C extension in keeping with PEP 517, i.e. with pyproject.toml instead of setup.py?
+https://stackoverflow.com/a/66479252
+
+https://github.com/pypa/sampleproject/blob/db5806e0a3204034c51b1c00dde7d5eb3fa2532e/setup.py
+
+https://pip.pypa.io/en/stable/cli/pip_install/#vcs-support
+vcs+protocol://repo_url/#egg=pkg&subdirectory=pkg_dir
+'git+https://github.com/wrmsr/omlish@master#subdirectory=.pip/omlish'
+"""
+# ruff: noqa: UP006 UP007
+
+
+class PyprojectPackageGenerator:
+    def __init__(
+            self,
+            dir_name: str,
+            build_root: str,
+    ) -> None:
+        super().__init__()
+        self._dir_name = dir_name
+        self._build_root = build_root
+
+    #
+
+    @cached_nullary
+    def about(self) -> types.ModuleType:
+        return importlib.import_module(f'{self._dir_name}.__about__')
+
+    @cached_nullary
+    def project_cls(self) -> type:
+        return self.about().Project
+
+    @cached_nullary
+    def setuptools_cls(self) -> type:
+        return self.about().Setuptools
+
+    #
+
+    @cached_nullary
+    def _build_dir(self) -> str:
+        build_dir: str = os.path.join(self._build_root, self._dir_name)
+        if os.path.isdir(build_dir):
+            shutil.rmtree(build_dir)
+        os.makedirs(build_dir)
+        return build_dir
+
+    #
+
+    def _write_git_ignore(self) -> None:
+        git_ignore = [
+            '/*.egg-info/',
+            '/dist',
+        ]
+        with open(os.path.join(self._build_dir(), '.gitignore'), 'w') as f:
+            f.write('\n'.join(git_ignore))
+
+    #
+
+    def _symlink_source_dir(self) -> None:
+        os.symlink(
+            os.path.relpath(self._dir_name, self._build_dir()),
+            os.path.join(self._build_dir(), self._dir_name),
+        )
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class FileContents:
+        pyproject_dct: ta.Mapping[str, ta.Any]
+        manifest_in: ta.Optional[ta.Sequence[str]]
+
+    @staticmethod
+    def _build_cls_dct(cls: type) -> ta.Dict[str, ta.Any]:  # noqa
+        dct = {}
+        for b in reversed(cls.__mro__):
+            for k, v in b.__dict__.items():
+                if k.startswith('_'):
+                    continue
+                dct[k] = v
+        return dct
+
+    @staticmethod
+    def _move_dict_key(
+            sd: ta.Dict[str, ta.Any],
+            sk: str,
+            dd: ta.Dict[str, ta.Any],
+            dk: str,
+    ) -> None:
+        if sk in sd:
+            dd[dk] = sd.pop(sk)
+
+    @cached_nullary
+    def file_contents(self) -> FileContents:
+        pyp_dct = {}
+
+        #
+
+        pyp_dct['build-system'] = {
+            'requires': ['setuptools'],
+            'build-backend': 'setuptools.build_meta',
+        }
+
+        prj = self._build_cls_dct(self.project_cls())
+        pyp_dct['project'] = prj
+
+        self._move_dict_key(prj, 'optional_dependencies', pyp_dct, extrask := 'project.optional-dependencies')
+        if (extras := pyp_dct.get(extrask)):
+            pyp_dct[extrask] = {
+                'all': [
+                    e
+                    for lst in extras.values()
+                    for e in lst
+                ],
+                **extras,
+            }
+
+        #
+
+        st = self._build_cls_dct(self.setuptools_cls())
+        pyp_dct['tool.setuptools'] = st
+
+        self._move_dict_key(st, 'find_packages', pyp_dct, 'tool.setuptools.packages.find')
+
+        mani_in = st.pop('manifest_in', None)
+
+        #
+
+        return self.FileContents(
+            pyp_dct,
+            mani_in,
+        )
+
+    def _write_file_contents(self) -> None:
+        fc = self.file_contents()
+
+        with open(os.path.join(self._build_dir(), 'pyproject.toml'), 'w') as f:
+            TomlWriter(f).write_root(fc.pyproject_dct)
+
+        if fc.manifest_in:
+            with open(os.path.join(self._build_dir(), 'MANIFEST.in'), 'w') as f:
+                f.write('\n'.join(fc.manifest_in))  # noqa
+
+    #
+
+    _STANDARD_FILES: ta.Sequence[str] = [
+        'LICENSE',
+        'README.rst',
+    ]
+
+    def _symlink_standard_files(self) -> None:
+        for fn in self._STANDARD_FILES:
+            if os.path.exists(fn):
+                os.symlink(os.path.relpath(fn, self._build_dir()), os.path.join(self._build_dir(), fn))
+
+    #
+
+    def _run_build(
+            self,
+            build_output_dir: ta.Optional[str] = None,
+    ) -> None:
+        subprocess.check_call(
+            [
+                sys.executable,
+                '-m',
+                'build',
+            ],
+            cwd=self._build_dir(),
+        )
+
+        if build_output_dir is not None:
+            dist_dir = os.path.join(self._build_dir(), 'dist')
+            for fn in os.listdir(dist_dir):
+                shutil.copyfile(os.path.join(dist_dir, fn), os.path.join(build_output_dir, fn))
+
+    #
+
+    def gen(
+            self,
+            *,
+            run_build: bool = False,
+            build_output_dir: ta.Optional[str] = None,
+    ) -> str:
+        log.info('Generating pyproject package: %s -> %s', self._dir_name, self._build_root)
+
+        self._build_dir()
+        self._write_git_ignore()
+        self._symlink_source_dir()
+        self._write_file_contents()
+        self._symlink_standard_files()
+
+        if run_build:
+            self._run_build(build_output_dir)
+
+        return self._build_dir()
+
+
 ########################################
 # ../../../omlish/lite/subprocesses.py
 # ruff: noqa: UP006 UP007
@@ -3552,6 +3938,49 @@ def _venv_cmd(args) -> None:
 ##
 
 
+def _pkg_cmd(args) -> None:
+    run = Run()
+
+    cmd = args.cmd
+    if not cmd:
+        raise Exception('must specify command')
+
+    elif cmd == 'gen':
+        build_root = os.path.join('.pkg')
+
+        if os.path.exists(build_root):
+            shutil.rmtree(build_root)
+
+        build_output_dir = 'dist'
+        run_build = bool(args.build)
+
+        num_threads = 8
+
+        if run_build:
+            os.makedirs(build_output_dir, exist_ok=True)
+
+        with cf.ThreadPoolExecutor(num_threads) as ex:
+            futs = [
+                ex.submit(functools.partial(
+                    PyprojectPackageGenerator(
+                        dir_name,
+                        build_root,
+                    ).gen,
+                    run_build=run_build,
+                    build_output_dir=build_output_dir,
+                ))
+                for dir_name in run.cfg().pkgs
+            ]
+            for fut in futs:
+                fut.result()
+
+    else:
+        raise Exception(f'unknown subcommand: {cmd}')
+
+
+##
+
+
 def _build_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser()
     parser.add_argument('--_docker_container', help=argparse.SUPPRESS)
@@ -3565,6 +3994,12 @@ def _build_parser() -> argparse.ArgumentParser:
     parser_resolve.add_argument('args', nargs=argparse.REMAINDER)
     parser_resolve.set_defaults(func=_venv_cmd)
 
+    parser_resolve = subparsers.add_parser('pkg')
+    parser_resolve.add_argument('-b', '--build', action='store_true')
+    parser_resolve.add_argument('cmd', nargs='?')
+    parser_resolve.add_argument('args', nargs=argparse.REMAINDER)
+    parser_resolve.set_defaults(func=_pkg_cmd)
+
     return parser
 
 

{omdev-0.0.0.dev7 → omdev-0.0.0.dev10/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev7
+Version: 0.0.0.dev10
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,13 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev7
+Requires-Dist: omlish==0.0.0.dev10
+Provides-Extra: all
+Requires-Dist: pycparser>=2.22; extra == "all"
+Requires-Dist: cffi>=1.17; extra == "all"
+Requires-Dist: pcpp>=1.30; extra == "all"
+Requires-Dist: mypy>=1.11; extra == "all"
+Requires-Dist: tokenize_rt>=6; extra == "all"
 Provides-Extra: c
 Requires-Dist: pycparser>=2.22; extra == "c"
 Requires-Dist: cffi>=1.17; extra == "c"

omdev-0.0.0.dev10/omdev.egg-info/requires.txt

@@ -0,0 +1,19 @@
+omlish==0.0.0.dev10
+
+[all]
+pycparser>=2.22
+cffi>=1.17
+pcpp>=1.30
+mypy>=1.11
+tokenize_rt>=6
+
+[c]
+pycparser>=2.22
+cffi>=1.17
+pcpp>=1.30
+
+[mypy]
+mypy>=1.11
+
+[tokens]
+tokenize_rt>=6

{omdev-0.0.0.dev7 → omdev-0.0.0.dev10}/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.dev7'
+version = '0.0.0.dev10'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,10 +22,17 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev7',
+    'omlish == 0.0.0.dev10',
 ]
 
 [project.optional-dependencies]
+all = [
+    'pycparser >= 2.22',
+    'cffi >= 1.17',
+    'pcpp >= 1.30',
+    'mypy >= 1.11',
+    'tokenize_rt >= 6',
+]
 c = [
     'pycparser >= 2.22',
     'cffi >= 1.17',

omdev-0.0.0.dev7/omdev.egg-info/requires.txt

@@ -1,12 +0,0 @@
-omlish==0.0.0.dev7
-
-[c]
-pycparser>=2.22
-cffi>=1.17
-pcpp>=1.30
-
-[mypy]
-mypy>=1.11
-
-[tokens]
-tokenize_rt>=6