omdev 0.0.41__tar.gz → 0.0.43__tar.gz

{omdev-0.0.41 → omdev-0.0.43}/LICENSE

@@ -1,3 +1,9 @@
+Except where otherwise indicated, original code in this repository is licensed under the BSD 3-Clause License.
+
+Third-party and adapted code retains the license identified in its source file and/or directory.
+
+====
+
 Copyright 2023- wrmsr
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the

{omdev-0.0.41/omdev.egg-info → omdev-0.0.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.41
+Version: 0.0.43
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -10,13 +10,14 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omcore==0.0.41
+Requires-Dist: omcore==0.0.43
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.41; extra == "all"
-Requires-Dist: omllm==0.0.41; extra == "all"
+Requires-Dist: ominfra==0.0.43; extra == "all"
+Requires-Dist: omllm==0.0.43; extra == "all"
 Requires-Dist: black~=26.5; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -35,9 +36,9 @@ Requires-Dist: textual~=8.2; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
 Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.41; extra == "ominfra"
+Requires-Dist: ominfra==0.0.43; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.41; extra == "omllm"
+Requires-Dist: omllm==0.0.43; extra == "omllm"
 Provides-Extra: black
 Requires-Dist: black~=26.5; extra == "black"
 Provides-Extra: c

{omdev-0.0.41 → omdev-0.0.43}/omdev/cache/compute/currents.py

@@ -25,7 +25,7 @@ _CURRENT_CACHE: Cache | None = None
 
 
 @contextlib.contextmanager
-def setting_current_cache(cache: CacheT) -> ta.Iterator[CacheT]:
+def setting_current_cache(cache: CacheT) -> ta.Generator[CacheT]:
     global _CURRENT_CACHE
     prev = _CURRENT_CACHE
 
@@ -53,7 +53,7 @@ def setting_current_context(
         obj: Object,
         key: CacheKey | None = None,
         **kwargs: ta.Any,
-) -> ta.Iterator[Context]:
+) -> ta.Generator[Context]:
     global _CURRENT_CONTEXT
     prev = _CURRENT_CONTEXT
 

{omdev-0.0.41 → omdev-0.0.43}/omdev/cexts/_distutils/build_ext.py

@@ -305,7 +305,7 @@ class BuildExt:
             return self._build_extension(ext)
 
     @contextlib.contextmanager
-    def _filter_build_errors(self, ext: extension.Extension) -> ta.Iterator[None]:
+    def _filter_build_errors(self, ext: extension.Extension) -> ta.Generator[None]:
         try:
             yield
         except (

{omdev-0.0.41 → omdev-0.0.43}/omdev/dockerdev/resources/fragments/om.sh

@@ -1,5 +1,6 @@
 curl -LsSf 'https://raw.githubusercontent.com/wrmsr/om/master/omdev/cli/install.py' | bash --login -c 'python3 - $@' - \
   omcore-cext \
+  omcore-mypyc \
   omdev-cext \
   ominfra \
   omllm \
@@ -12,9 +13,9 @@ curl -LsSf 'https://raw.githubusercontent.com/wrmsr/om/master/omdev/cli/install.
   orjson \
   pyyaml \
   \
-  textual \
-  textual-speedups \
-  \
   pg8000 \
   pymysql \
+  \
+  textual \
+  textual-speedups \
 ;

{omdev-0.0.41 → omdev-0.0.43}/omdev/git/vendor/upstreams.py

@@ -15,7 +15,7 @@ def git_upstream_source(
         *,
         from_path: str | None = None,
         timeout: float = 15. * 60.,
-) -> ta.Iterator[GitRunner]:
+) -> ta.Generator[GitRunner]:
     """
     Yields a GitRunner for the upstream repo - either an existing local clone (used strictly read-only) or a temporary
     bare clone of `url` which is removed afterward.

{omdev-0.0.41 → omdev-0.0.43}/omdev/js/quickjs/_pyqjsng.c

@@ -10,7 +10,8 @@
 //     "-Wno-unreachable-code",
 //     "-Wno-unused-but-set-variable",
 //     "-Wno-unused-const-variable",
-//     "-Wno-unused-function"
+//     "-Wno-unused-function",
+//     "-fvisibility=hidden"
 //   ],
 //   "define_macros": {
 //     "_GNU_SOURCE": "1"

{omdev-0.0.41 → omdev-0.0.43}/omdev/pyproject/cli.py

@@ -22,6 +22,7 @@ See:
 import argparse
 import asyncio
 import concurrent.futures as cf
+import dataclasses as dc
 import functools
 import itertools
 import multiprocessing as mp
@@ -43,6 +44,7 @@ from omcore.logs.std.standard import configure_standard_logging
 
 from .configs import PyprojectConfig
 from .configs import PyprojectConfigPreparer
+from .configs import VenvConfig
 from .pkg import BasePyprojectPackageGenerator
 from .pkg import PyprojectPackageGenerator
 from .venvs import Venv
@@ -93,11 +95,46 @@ class Run:
 
     @cached_nullary
     def venvs(self) -> ta.Mapping[str, Venv]:
-        return {
-            n: Venv(n, c)
-            for n, c in self.cfg().venvs.items()
-            if not n.startswith('_')
-        }
+        real_cfgs: ta.Dict[str, VenvConfig] = {}
+        alias_set: ta.Set[str] = set()
+        alias_map: ta.Dict[str, ta.List[str]] = {}
+
+        for n, c in self.cfg().venvs.items():
+            if n.startswith('_'):
+                continue
+
+            check.not_in(n, real_cfgs)
+            check.not_in(n, alias_set)
+
+            if (af := c.alias_for):
+                alias_set.add(n)
+                alias_map.setdefault(af, []).append(n)
+                continue
+
+            for a in c.aliases or []:
+                check.not_in(a, real_cfgs)
+                check.not_in(a, alias_set)
+                alias_set.add(n)
+                alias_map.setdefault(a, []).append(n)
+
+            real_cfgs[n] = c
+
+        venvs: ta.Dict[str, Venv] = {}
+        for n, c in real_cfgs.items():
+            cal = [
+                *(c.aliases or []),
+                *alias_map.get(n, []),
+            ]
+            c = dc.replace(c, aliases=cal or None)
+
+            venvs[n] = Venv(n, c)
+
+        for n, afs in alias_map.items():
+            v = venvs[n]
+            for af in afs:
+                venvs[af] = v
+
+        return venvs
 
 
 ##
@@ -192,6 +229,7 @@ class PyprojectCli(ArgparseCli):
         argparse_arg('-b', '--build', action='store_true'),
         argparse_arg('-r', '--revision', action='store_true'),
         argparse_arg('-j', '--jobs', type=int),
+        argparse_arg('-S', '--suffix', action='append'),
         argparse_arg('cmd', nargs='?'),
         argparse_arg('args', nargs=argparse.REMAINDER),
     )
@@ -223,6 +261,8 @@ class PyprojectCli(ArgparseCli):
                 for dir_name in run.cfg().pkgs
             ]
             pgs = list(itertools.chain.from_iterable([pg, *pg.children()] for pg in pgs))
+            if self.args.suffix is not None:
+                pgs = [pg for pg in pgs if pg.pkg_suffix.lstrip('-') in self.args.suffix]
 
             num_threads = self.args.jobs or int(max(mp.cpu_count() // 1.5, 1))
             futs: ta.List[cf.Future]
@@ -245,6 +285,40 @@ class PyprojectCli(ArgparseCli):
                     for fut in futs:
                         fut.result()
 
+        elif cmd == 'build':
+            pkgs_root = os.path.join('.pkg')
+
+            build_output_dir = 'dist'
+            add_revision = bool(self.args.revision)
+
+            os.makedirs(build_output_dir, exist_ok=True)
+
+            pgs = [
+                PyprojectPackageGenerator(
+                    dir_name,
+                    pkgs_root,
+                )
+                for dir_name in run.cfg().pkgs
+            ]
+            pgs = list(itertools.chain.from_iterable([pg, *pg.children()] for pg in pgs))
+            if self.args.suffix is not None:
+                pgs = [pg for pg in pgs if pg.pkg_suffix.lstrip('-') in self.args.suffix]
+
+            num_threads = self.args.jobs or int(max(mp.cpu_count() // 1.5, 1))
+            with cf.ThreadPoolExecutor(num_threads) as ex:
+                futs = [
+                    ex.submit(functools.partial(
+                        pg.build,
+                        build_output_dir,
+                        BasePyprojectPackageGenerator.BuildOpts(
+                            add_revision=add_revision,
+                        ),
+                    ))
+                    for pg in pgs
+                ]
+                for fut in futs:
+                    fut.result()
+
         else:
             raise Exception(f'unknown subcommand: {cmd}')
 

{omdev-0.0.41 → omdev-0.0.43}/omdev/pyproject/configs.py

@@ -2,6 +2,8 @@
 import dataclasses as dc
 import typing as ta
 
+from omcore.lite.check import check
+from omcore.lite.dataclasses import dataclass_maybe_post_init
 from omcore.lite.marshal import unmarshal_obj
 
 from ..interp.venvs import InterpVenvConfig
@@ -12,10 +14,26 @@ from ..interp.venvs import InterpVenvConfig
 
 @dc.dataclass(frozen=True)
 class VenvConfig(InterpVenvConfig):
+    alias_for: ta.Optional[str] = None
+    aliases: ta.Optional[ta.List[str]] = None
+
     inherits: ta.Optional[ta.Sequence[str]] = None
     docker_service: ta.Optional[str] = None
     srcs: ta.Optional[ta.List[str]] = None
 
+    def __post_init__(self) -> None:
+        dataclass_maybe_post_init(super())
+
+        if self.alias_for is not None:
+            check.non_empty_str(self.alias_for)
+            for f in dc.fields(self):
+                if f.name != 'alias_for':
+                    if getattr(self, f.name) is not None:
+                        raise ValueError(f'Must not set {f.name} when alias_for is present.')
+
+        else:
+            check.not_isinstance(self.inherits, str)
+
 
 @dc.dataclass(frozen=True)
 class PyprojectConfig:
@@ -93,6 +111,8 @@ class PyprojectConfigPreparer:
 
         ivs = dict(self._inherit_venvs(pcfg.venvs or {}))
         for k, v in ivs.items():
+            if v.alias_for:
+                continue
             v = dc.replace(v, srcs=self._resolve_srcs(v.srcs or [], pcfg.srcs or {}))
             v = dc.replace(v, interp=self._fixup_interp(v.interp))
             ivs[k] = v