omdev 0.0.41__tar.gz → 0.0.42__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.41
+Version: 0.0.42
 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.42
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.41; extra == "all"
-Requires-Dist: omllm==0.0.41; extra == "all"
+Requires-Dist: ominfra==0.0.42; extra == "all"
+Requires-Dist: omllm==0.0.42; 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.42; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.41; extra == "omllm"
+Requires-Dist: omllm==0.0.42; extra == "omllm"
 Provides-Extra: black
 Requires-Dist: black~=26.5; extra == "black"
 Provides-Extra: c

{omdev-0.0.41 → omdev-0.0.42}/omdev/pyproject/pkg.py

@@ -28,8 +28,9 @@ vcs+protocol://repo_url/#egg=pkg&subdirectory=pkg_dir
 import abc
 import dataclasses as dc
 import glob
-import importlib
+import importlib.util
 import inspect
+import json
 import os.path
 import shutil
 import sys
@@ -38,6 +39,7 @@ import textwrap
 import types
 import typing as ta
 
+from omcore.formats.toml.parser import toml_loads
 from omcore.formats.toml.writer import TomlWriter
 from omcore.lite.abstract import Abstract
 from omcore.lite.cached import cached_nullary
@@ -123,12 +125,14 @@ class BasePyprojectPackageGenerator(Abstract):
         return self.about().Setuptools
 
     @staticmethod
-    def _build_cls_dct(cls: type) -> ta.Dict[str, ta.Any]:  # noqa
+    def _build_cls_dct(cls: type, *, hyphenate: bool = False) -> ta.Dict[str, ta.Any]:  # noqa
         dct = {}
         for b in reversed(cls.__mro__):
             for k, v in b.__dict__.items():
                 if k.startswith('_'):
                     continue
+                if hyphenate:
+                    k = k.replace('_', '-')
                 dct[k] = v
         return dct
 
@@ -149,8 +153,8 @@ class BasePyprojectPackageGenerator(Abstract):
 
     def build_specs(self) -> Specs:
         return self.Specs(
-            self._build_cls_dct(self.project_cls()),
-            self._build_cls_dct(self.setuptools_cls()),
+            self._build_cls_dct(self.project_cls(), hyphenate=True),
+            self._build_cls_dct(self.setuptools_cls(), hyphenate=True),
         )
 
     #
@@ -338,7 +342,7 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
 
         pyp_dct['project'] = prj
 
-        self._move_dict_key(prj, 'optional_dependencies', pyp_dct, extrask := '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': [
@@ -349,13 +353,13 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
                 **extras,
             }
 
-        if (eps := prj.pop('entry_points', None)):
+        if (eps := prj.pop('entry-points', None)):
             pyp_dct['project.entry-points'] = {TomlWriter.Literal(f"'{k}'"): v for k, v in eps.items()}  # type: ignore  # noqa
 
         if (scs := prj.pop('scripts', None)):
             pyp_dct['project.scripts'] = scs
 
-        prj.pop('cli_scripts', None)
+        prj.pop('cli-scripts', None)
 
         ##
 
@@ -377,7 +381,7 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         #     'exclude': [*SetuptoolsBase.find_packages['exclude']],
         # }
 
-        fp = dict(st.pop('find_packages', {}))
+        fp = dict(st.pop('find-packages', {}))
 
         pyp_dct['tool.setuptools.packages.find'] = fp
 
@@ -394,8 +398,8 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         #     ],
         # }
 
-        pd = dict(st.pop('package_data', {}))
-        epd = dict(st.pop('exclude_package_data', {}))
+        pd = dict(st.pop('package-data', {}))
+        epd = dict(st.pop('exclude-package-data', {}))
 
         cpd = self._collect_pkg_data()
         for pdk, pdv in sorted(cpd.items(), key=lambda kv: kv[0]):
@@ -417,7 +421,7 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         #     'global-exclude **/conftest.py',
         # ]
 
-        mani_in = st.pop('manifest_in', None)
+        mani_in = st.pop('manifest-in', None)
 
         #
 
@@ -449,13 +453,12 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
                 pkg_suffix='-cext',
             ))
 
-        # FIXME:
-        # if self.build_specs().setuptools.get('mypyc'):
-        #     out.append(_PyprojectMypycPackageGenerator(
-        #         self._dir_name,
-        #         self._pkgs_root,
-        #         pkg_suffix='-mypyc',
-        #     ))
+        if self.build_specs().setuptools.get('mypyc'):
+            out.append(_PyprojectMypycPackageGenerator(
+                self._dir_name,
+                self._pkgs_root,
+                pkg_suffix='-mypyc',
+            ))
 
         if self.build_specs().setuptools.get('rs'):
             out.append(_PyprojectRsPackageGenerator(
@@ -464,7 +467,7 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
                 pkg_suffix='-rs',
             ))
 
-        if self.build_specs().pyproject.get('cli_scripts'):
+        if self.build_specs().pyproject.get('cli-scripts'):
             out.append(_PyprojectCliPackageGenerator(
                 self._dir_name,
                 self._pkgs_root,
@@ -487,10 +490,10 @@ class _PyprojectExtensionPackageGenerator(BasePyprojectPackageGenerator, Abstrac
         prj['name'] += self._pkg_suffix
 
         for k in [
-            'optional_dependencies',
-            'entry_points',
+            'optional-dependencies',
+            'entry-points',
             'scripts',
-            'cli_scripts',
+            'cli-scripts',
         ]:
             prj.pop(k, None)
 
@@ -504,9 +507,7 @@ class _PyprojectExtensionPackageGenerator(BasePyprojectPackageGenerator, Abstrac
             'mypyc',
             'rs',
 
-            'find_packages',
-            'package_data',
-            'manifest_in',
+            'package-data',
         ]:
             st.pop(k, None)
 
@@ -573,6 +574,8 @@ class _PyprojectCextPackageGenerator(_PyprojectExtensionPackageGenerator):
     def file_contents(self) -> _PyprojectExtensionPackageGenerator.FileContents:
         prj = self._build_project_dict()
         st = self._build_setuptools_dict()
+        st.pop('find-packages', None)
+        st.pop('manifest-in', None)
 
         #
 
@@ -714,15 +717,83 @@ class _PyprojectMypycPackageGenerator(_PyprojectExtensionPackageGenerator):
             dp
             for dp, dns, fns in os.walk(self._dir_name)
             for fn in fns
-            if fn == '.om-mypyc-ext'
+            if fn == '.om-mypyc-ext.json'
         )
 
     #
 
+    @cached_nullary
+    def _get_mypyc_config(self) -> ta.Mapping[str, ta.Any]:
+        with open('pyproject.toml') as f:
+            src = f.read()
+        pyp_dct = toml_loads(src)
+        mypy_dct = pyp_dct.get('tool', {}).get('mypy', {})
+        mypy_dct.pop('overrides', None)
+        return mypy_dct
+
+    #
+
+    @classmethod
+    def _package_patterns_to_manifest(
+            cls,
+            includes: ta.Iterable[str],
+            excludes: ta.Iterable[str],
+    ) -> ta.List[str]:
+        includes = set(includes)
+        excludes = set(excludes)
+
+        lines: ta.List[str] = []
+
+        # Collapse "foo" + "foo.*" into recursive-include.
+        recursive_includes = {
+            p
+            for p in includes
+            if '*' not in p and f'{p}.*' in includes
+        }
+
+        consumed_includes = recursive_includes | {f'{p}.*' for p in recursive_includes}
+
+        for p in sorted(recursive_includes):
+            lines.append(f'recursive-include {p.replace(".", "/")} *.py')
+
+        for p in sorted(includes - consumed_includes):
+            if '*' in p:
+                raise ValueError(f'Unsupported include pattern: {p!r}')
+            lines.append(f'include {p.replace(".", "/")}/*.py')
+
+        # Collapse "*.foo" + "*.foo.*" into excluding every foo package subtree.
+        recursive_excludes = {
+            p[:-2]
+            for p in excludes
+            if p.endswith('.*') and p[:-2] in excludes
+        }
+
+        consumed_excludes = recursive_excludes | {f'{p}.*' for p in recursive_excludes}
+
+        for p in sorted(recursive_excludes):
+            if not p.startswith('*.'):
+                raise ValueError(f'Unsupported exclude pattern: {p!r}')
+
+            name = p[2:]
+            lines.append(f'recursive-exclude **/{name} *.py')
+
+        if excludes - consumed_excludes:
+            raise ValueError(f'Unsupported exclude patterns: {sorted(excludes - consumed_excludes)!r}')
+
+        return lines
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class MypycExtConfig:
+        include: ta.Optional[ta.Sequence[str]] = None
+
     @cached_nullary
     def file_contents(self) -> _PyprojectExtensionPackageGenerator.FileContents:
         prj = self._build_project_dict()
         st = self._build_setuptools_dict()
+        st_fp = st.pop('find-packages', None)
+        mani_in = st.pop('manifest-in', None)
 
         #
 
@@ -733,13 +804,21 @@ class _PyprojectMypycPackageGenerator(_PyprojectExtensionPackageGenerator):
 
         #
 
-        pyp_dct = {}
+        pyp_dct: dict = {}
+
+        project_cls = ta.cast(ta.Any, self.project_cls())
+
+        mypy_dep = check.single(
+            d
+            for d in project_cls.optional_dependencies['mypy']
+            if d.split()[0] == 'mypy'
+        )
 
         pyp_dct['build-system'] = {
             'requires': [
                 'setuptools',
-                'mypy',
-                f'{prj["name"]} == {prj["version"]}',
+                mypy_dep,
+                # f'{project_cls.name} == {prj["version"]}',
             ],
             'build-backend': 'setuptools.build_meta',
         }
@@ -751,18 +830,26 @@ class _PyprojectMypycPackageGenerator(_PyprojectExtensionPackageGenerator):
 
         ext_dirs = sorted(self.find_mypyc_dirs())
 
-        # pyp_dct['tool.setuptools.packages.find'] = {
-        #     'include': [
-        #         ext_dir.replace(os.sep, '.')
-        #         for ext_dir in ext_dirs
-        #     ],
-        # }
+        pkg_incs: ta.Set[str] = set()
 
         #
 
         ext_lines: list = []
 
         for ext_dir in ext_dirs:  # noqa
+            ext_name = ext_dir.replace(os.sep, '.')
+            pkg_incs.add(ext_name)
+
+            with open(os.path.join(ext_dir, '.om-mypyc-ext.json')) as f:
+                ext_cfg_src = f.read().strip()
+            if ext_cfg_src:
+                ext_cfg: _PyprojectMypycPackageGenerator.MypycExtConfig = unmarshal_obj(
+                    json.loads(ext_cfg_src),
+                    _PyprojectMypycPackageGenerator.MypycExtConfig,
+                )
+                for ext_inc in ext_cfg.include or []:
+                    pkg_incs.add(importlib.util.resolve_name(ext_inc, ext_name))
+
             ext_files = [
                 fp
                 for fn in sorted(os.listdir(ext_dir))
@@ -791,11 +878,38 @@ class _PyprojectMypycPackageGenerator(_PyprojectExtensionPackageGenerator):
             '',
         ])
 
+        for pkg_inc in list(pkg_incs):
+            if pkg_inc.endswith('*'):
+                continue
+            pkg_incs.add(pkg_inc + '.*')
+            for i in range(pkg_inc.count('.')):
+                pkg_incs.add('.'.join(pkg_inc.split('.')[:i + 1]))
+
+        pkg_excs = (st_fp or {}).get('exclude')
+
+        mani_in = [
+            *self._package_patterns_to_manifest(
+                pkg_incs or [],
+                pkg_excs or [],
+            ),
+            *(mani_in or []),
+        ]
+
+        pyp_dct['tool.setuptools.packages.find'] = {
+            'include': [],
+        }
+
+        #
+
+        if mypyc_cfg := self._get_mypyc_config():
+            pyp_dct['tool.mypy'] = mypyc_cfg
+
         #
 
         return self.FileContents(
             pyp_dct,
             src,
+            manifest_in=mani_in,
         )
 
 
@@ -850,6 +964,8 @@ class _PyprojectRsPackageGenerator(_PyprojectExtensionPackageGenerator):
     def file_contents(self) -> _PyprojectExtensionPackageGenerator.FileContents:
         prj = self._build_project_dict()
         st = self._build_setuptools_dict()
+        st.pop('find-packages', None)
+        st.pop('manifest-in', None)
 
         #
 
@@ -929,15 +1045,15 @@ class _PyprojectCliPackageGenerator(BasePyprojectPackageGenerator):
         prj['dependencies'] = [f'{prj["name"]} == {prj["version"]}']
         prj['name'] += self._pkg_suffix
         for k in [
-            'optional_dependencies',
-            'entry_points',
+            'optional-dependencies',
+            'entry-points',
             'scripts',
         ]:
             prj.pop(k, None)
 
         pyp_dct['project'] = prj
 
-        if (scs := prj.pop('cli_scripts', None)):
+        if (scs := prj.pop('cli-scripts', None)):
             pyp_dct['project.scripts'] = scs
 
         #
@@ -950,9 +1066,9 @@ class _PyprojectCliPackageGenerator(BasePyprojectPackageGenerator):
             'mypyc',
             'rs',
 
-            'find_packages',
-            'package_data',
-            'manifest_in',
+            'find-packages',
+            'package-data',
+            'manifest-in',
         ]:
             st.pop(k, None)