omdev 0.0.0.dev17__py3-none-any.whl → 0.0.0.dev19__py3-none-any.whl

omdev/__about__.py

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

omdev/cexts/cmake.py

@@ -1,6 +1,7 @@
 """
 FIXME:
  - debug tables don't handle symlinks
+ - use relapths in cml.txt
 
 TODO:
  - symlink headers, included src files (hamt_impl, ...)
@@ -37,6 +38,7 @@ from omlish import logs
 
 from .. import cmake
 from .. import findmagic
+from .magic import CextMagic
 
 
 log = logging.getLogger(__name__)
@@ -45,12 +47,6 @@ log = logging.getLogger(__name__)
 ##
 
 
-MAGIC = '@omdev-cext'
-MAGIC_COMMENT = f'// {MAGIC}'
-
-FILE_EXTENSIONS = ('c', 'cc', 'cpp')
-
-
 def _sep_str_grps(*ls: ta.Sequence[str]) -> list[str]:
     o = []
     for i, l in enumerate(ls):
@@ -87,7 +83,7 @@ class CmakeProjectGen:
 
     @lang.cached_function
     def cmake_dir(self) -> str:
-        cmake_dir = os.path.join(self.prj_root, 'cmake')
+        cmake_dir = os.path.join(self.prj_root, 'cmake', self.prj_name())
         if os.path.exists(cmake_dir):
             for e in os.listdir(cmake_dir):
                 if e == '.idea':
@@ -98,7 +94,7 @@ class CmakeProjectGen:
                 else:
                     shutil.rmtree(ep)
         else:
-            os.mkdir(cmake_dir)
+            os.makedirs(cmake_dir)
         return cmake_dir
 
     #
@@ -109,17 +105,6 @@ class CmakeProjectGen:
 
     #
 
-    def write_idea_name(self) -> None:
-        idea_dir = os.path.join(self.cmake_dir(), '.idea')
-        if not os.path.isdir(idea_dir):
-            os.mkdir(idea_dir)
-        idea_name_file = os.path.join(idea_dir, '.name')
-        if not os.path.isfile(idea_name_file):
-            with open(idea_name_file, 'w') as f:
-                f.write(self.prj_name())
-
-    #
-
     @dc.dataclass(frozen=True, kw_only=True)
     class PyInfo:
         venv_exe: str
@@ -153,8 +138,8 @@ class CmakeProjectGen:
                 out.extend(
                     findmagic.find_magic(
                         [e],
-                        [MAGIC_COMMENT],
-                        FILE_EXTENSIONS,
+                        [CextMagic.MAGIC_COMMENT],
+                        CextMagic.FILE_EXTENSIONS,
                     ),
                 )
             else:
@@ -224,7 +209,7 @@ class CmakeProjectGen:
                         [
                             ' '.join([
                                 'COMMAND ${CMAKE_COMMAND} -E ',
-                                f'copy $<TARGET_FILE_NAME:{ext_name}> ../../{os.path.dirname(ext_src)}/{so_name}',
+                                f'copy $<TARGET_FILE_NAME:{ext_name}> ../../../{os.path.dirname(ext_src)}/{so_name}',
                             ]),
                             'COMMAND_EXPAND_LISTS',
                         ],
@@ -311,7 +296,6 @@ class CmakeProjectGen:
 
         self.cmake_dir()
         self.write_git_ignore()
-        self.write_idea_name()
 
         out = io.StringIO()
         clg = self._CmakeListsGen(self, out)

omdev/cexts/magic.py

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

omdev/cexts/scan.py

@@ -5,18 +5,17 @@ import typing as ta
 
 from omlish import logs
 
-
-log = logging.getLogger(__name__)
+from .magic import CextMagic
 
 
-SCAN_COMMENT = '// @omdev-cext'
+log = logging.getLogger(__name__)
 
 
 def scan_one(
         input_path: str,
         **kwargs: ta.Any,
 ) -> None:
-    if not any(input_path.endswith(fx) for fx in ('.c', '.cc', '.cpp')):
+    if not any(input_path.endswith('.' + fx) for fx in CextMagic.FILE_EXTENSIONS):
         return
 
     with open(input_path, 'rb') as f:
@@ -27,9 +26,9 @@ def scan_one(
     except UnicodeDecodeError:
         return
 
-    sls = [l for l in src.splitlines() if l.startswith(SCAN_COMMENT)]
+    sls = [l for l in src.splitlines() if l.startswith(CextMagic.MAGIC_COMMENT)]
     for sl in sls:
-        sas = sl[len(SCAN_COMMENT):].split()  # noqa
+        sas = sl[len(CextMagic.MAGIC_COMMENT):].split()  # noqa
 
         log.info('Found ext: %s', input_path)
 

omdev/pyproject/cli.py

@@ -301,10 +301,10 @@ def _pkg_cmd(args) -> None:
         raise Exception('must specify command')
 
     elif cmd == 'gen':
-        build_root = os.path.join('.pkg')
+        pkgs_root = os.path.join('.pkg')
 
-        if os.path.exists(build_root):
-            shutil.rmtree(build_root)
+        if os.path.exists(pkgs_root):
+            shutil.rmtree(pkgs_root)
 
         build_output_dir = 'dist'
         run_build = bool(args.build)
@@ -319,11 +319,13 @@ def _pkg_cmd(args) -> None:
                 ex.submit(functools.partial(
                     PyprojectPackageGenerator(
                         dir_name,
-                        build_root,
+                        pkgs_root,
                     ).gen,
-                    run_build=run_build,
-                    build_output_dir=build_output_dir,
-                    add_revision=add_revision,
+                    PyprojectPackageGenerator.GenOpts(
+                        run_build=run_build,
+                        build_output_dir=build_output_dir,
+                        add_revision=add_revision,
+                    ),
                 ))
                 for dir_name in run.cfg().pkgs
             ]

omdev/pyproject/pkg.py

@@ -4,6 +4,14 @@ TODO:
  - __revision__
  - entry_points
 
+** NOTE **
+setuptools now (2024/09/02) has experimental support for extensions in pure pyproject.toml - but we still want a
+separate '-cext' package
+  https://setuptools.pypa.io/en/latest/userguide/ext_modules.html
+  https://github.com/pypa/setuptools/commit/1a9d87308dc0d8aabeaae0dce989b35dfb7699f0#diff-61d113525e9cc93565799a4bb8b34a68e2945b8a3f7d90c81380614a4ea39542R7-R8
+
+--
+
 https://setuptools.pypa.io/en/latest/references/keywords.html
 https://packaging.python.org/en/latest/specifications/pyproject-toml
 
@@ -15,8 +23,9 @@ https://github.com/pypa/sampleproject/blob/db5806e0a3204034c51b1c00dde7d5eb3fa25
 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'
-"""
+"""  # noqa
 # ruff: noqa: UP006 UP007
+import abc
 import dataclasses as dc
 import importlib
 import os.path
@@ -29,19 +38,27 @@ import typing as ta
 from omlish.lite.cached import cached_nullary
 from omlish.lite.logs import log
 
+from ..cexts.magic import CextMagic
+from ..findmagic import find_magic
 from ..toml.writer import TomlWriter
 from ..tools.revisions import GitRevisionAdder
 
 
-class PyprojectPackageGenerator:
+#
+
+
+class BasePyprojectPackageGenerator(abc.ABC):
     def __init__(
             self,
             dir_name: str,
-            build_root: str,
+            pkgs_root: str,
+            *,
+            pkg_suffix: str = '',
     ) -> None:
         super().__init__()
         self._dir_name = dir_name
-        self._build_root = build_root
+        self._pkgs_root = pkgs_root
+        self._pkg_suffix = pkg_suffix
 
     #
 
@@ -49,48 +66,44 @@ class PyprojectPackageGenerator:
     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 _pkg_dir(self) -> str:
+        pkg_dir: str = os.path.join(self._pkgs_root, self._dir_name + self._pkg_suffix)
+        if os.path.isdir(pkg_dir):
+            shutil.rmtree(pkg_dir)
+        os.makedirs(pkg_dir)
+        return pkg_dir
 
     #
 
+    _GIT_IGNORE: ta.Sequence[str] = [
+        '/*.egg-info/',
+        '/dist',
+    ]
+
     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))
+        with open(os.path.join(self._pkg_dir(), '.gitignore'), 'w') as f:
+            f.write('\n'.join(self._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),
+            os.path.relpath(self._dir_name, self._pkg_dir()),
+            os.path.join(self._pkg_dir(), self._dir_name),
         )
 
     #
 
-    @dc.dataclass(frozen=True)
-    class FileContents:
-        pyproject_dct: ta.Mapping[str, ta.Any]
-        manifest_in: ta.Optional[ta.Sequence[str]]
+    @cached_nullary
+    def project_cls(self) -> type:
+        return self.about().Project
+
+    @cached_nullary
+    def setuptools_cls(self) -> type:
+        return self.about().Setuptools
 
     @staticmethod
     def _build_cls_dct(cls: type) -> ta.Dict[str, ta.Any]:  # noqa
@@ -112,18 +125,115 @@ class PyprojectPackageGenerator:
         if sk in sd:
             dd[dk] = sd.pop(sk)
 
+    @dc.dataclass(frozen=True)
+    class Specs:
+        pyproject: ta.Dict[str, ta.Any]
+        setuptools: ta.Dict[str, ta.Any]
+
+    def build_specs(self) -> Specs:
+        return self.Specs(
+            self._build_cls_dct(self.project_cls()),
+            self._build_cls_dct(self.setuptools_cls()),
+        )
+
+    #
+
+    @abc.abstractmethod
+    def _write_file_contents(self) -> None:
+        raise NotImplementedError
+
+    #
+
+    _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._pkg_dir()), os.path.join(self._pkg_dir(), fn))
+
+    #
+
+    def _run_build(
+            self,
+            build_output_dir: ta.Optional[str] = None,
+            *,
+            add_revision: bool = False,
+    ) -> None:
+        subprocess.check_call(
+            [
+                sys.executable,
+                '-m',
+                'build',
+            ],
+            cwd=self._pkg_dir(),
+        )
+
+        dist_dir = os.path.join(self._pkg_dir(), 'dist')
+
+        if add_revision:
+            GitRevisionAdder().add_to(dist_dir)
+
+        if build_output_dir is not None:
+            for fn in os.listdir(dist_dir):
+                shutil.copyfile(os.path.join(dist_dir, fn), os.path.join(build_output_dir, fn))
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class GenOpts:
+        run_build: bool = False
+        build_output_dir: ta.Optional[str] = None
+        add_revision: bool = False
+
+    def gen(self, opts: GenOpts = GenOpts()) -> str:
+        log.info('Generating pyproject package: %s -> %s (%s)', self._dir_name, self._pkgs_root, self._pkg_suffix)
+
+        self._pkg_dir()
+        self._write_git_ignore()
+        self._symlink_source_dir()
+        self._write_file_contents()
+        self._symlink_standard_files()
+
+        if opts.run_build:
+            self._run_build(
+                opts.build_output_dir,
+                add_revision=opts.add_revision,
+            )
+
+        return self._pkg_dir()
+
+
+#
+
+
+class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class FileContents:
+        pyproject_dct: ta.Mapping[str, ta.Any]
+        manifest_in: ta.Optional[ta.Sequence[str]]
+
     @cached_nullary
     def file_contents(self) -> FileContents:
-        pyp_dct = {}
+        specs = self.build_specs()
 
         #
 
+        pyp_dct = {}
+
         pyp_dct['build-system'] = {
             'requires': ['setuptools'],
             'build-backend': 'setuptools.build_meta',
         }
 
-        prj = self._build_cls_dct(self.project_cls())
+        prj = specs.pyproject
+        prj['name'] += self._pkg_suffix
+
         pyp_dct['project'] = prj
 
         self._move_dict_key(prj, 'optional_dependencies', pyp_dct, extrask := 'project.optional-dependencies')
@@ -139,9 +249,11 @@ class PyprojectPackageGenerator:
 
         #
 
-        st = self._build_cls_dct(self.setuptools_cls())
+        st = specs.setuptools
         pyp_dct['tool.setuptools'] = st
 
+        st.pop('cexts', None)
+
         self._move_dict_key(st, 'find_packages', pyp_dct, 'tool.setuptools.packages.find')
 
         mani_in = st.pop('manifest_in', None)
@@ -156,72 +268,121 @@ class PyprojectPackageGenerator:
     def _write_file_contents(self) -> None:
         fc = self.file_contents()
 
-        with open(os.path.join(self._build_dir(), 'pyproject.toml'), 'w') as f:
+        with open(os.path.join(self._pkg_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:
+            with open(os.path.join(self._pkg_dir(), 'MANIFEST.in'), 'w') as f:
                 f.write('\n'.join(fc.manifest_in))  # noqa
 
     #
 
-    _STANDARD_FILES: ta.Sequence[str] = [
-        'LICENSE',
-        'README.rst',
-    ]
+    def gen(self, opts: BasePyprojectPackageGenerator.GenOpts = BasePyprojectPackageGenerator.GenOpts()) -> str:
+        ret = super().gen(opts)
 
-    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))
+        if self.build_specs().setuptools.get('cexts'):
+            _PyprojectCextPackageGenerator(
+                self._dir_name,
+                self._pkgs_root,
+                pkg_suffix='-cext',
+            ).gen(opts)
 
-    #
+        return ret
 
-    def _run_build(
-            self,
-            build_output_dir: ta.Optional[str] = None,
-            *,
-            add_revision: bool = False,
-    ) -> None:
-        subprocess.check_call(
-            [
-                sys.executable,
-                '-m',
-                'build',
-            ],
-            cwd=self._build_dir(),
-        )
 
-        dist_dir = os.path.join(self._build_dir(), 'dist')
+#
 
-        if add_revision:
-            GitRevisionAdder().add_to(dist_dir)
 
-        if build_output_dir is not None:
-            for fn in os.listdir(dist_dir):
-                shutil.copyfile(os.path.join(dist_dir, fn), os.path.join(build_output_dir, fn))
+class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
 
     #
 
-    def gen(
-            self,
-            *,
-            run_build: bool = False,
-            build_output_dir: ta.Optional[str] = None,
-            add_revision: bool = False,
-    ) -> str:
-        log.info('Generating pyproject package: %s -> %s', self._dir_name, self._build_root)
+    @cached_nullary
+    def find_cext_srcs(self) -> ta.Sequence[str]:
+        return sorted(find_magic(
+            [self._dir_name],
+            [CextMagic.MAGIC_COMMENT],
+            CextMagic.FILE_EXTENSIONS,
+        ))
 
-        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,
-                add_revision=add_revision,
-            )
+    @dc.dataclass(frozen=True)
+    class FileContents:
+        pyproject_dct: ta.Mapping[str, ta.Any]
+        setup_py: str
+
+    @cached_nullary
+    def file_contents(self) -> FileContents:
+        specs = self.build_specs()
+
+        #
+
+        pyp_dct = {}
+
+        pyp_dct['build-system'] = {
+            'requires': ['setuptools'],
+            'build-backend': 'setuptools.build_meta',
+        }
+
+        prj = specs.pyproject
+        prj['dependencies'] = [f'{prj["name"]} == {prj["version"]}']
+        prj['name'] += self._pkg_suffix
+        prj.pop('optional_dependencies', None)
+
+        pyp_dct['project'] = prj
+
+        #
+
+        st = specs.setuptools
+        pyp_dct['tool.setuptools'] = st
+
+        st.pop('cexts', None)
+        st.pop('find_packages', None)
+        st.pop('manifest_in', None)
+
+        pyp_dct['tool.setuptools.packages.find'] = {
+            'include': [],
+        }
+
+        #
+
+        ext_lines = []
+
+        for ext_src in self.find_cext_srcs():
+            ext_name = ext_src.rpartition('.')[0].replace(os.sep, '.')
+            ext_lines.extend([
+                'st.Extension(',
+                f"    name='{ext_name}',",
+                f"    sources=['{ext_src}'],",
+                "    extra_compile_args=['-std=c++20'],",
+                '),',
+            ])
+
+        src = '\n'.join([
+            'import setuptools as st',
+            '',
+            '',
+            'st.setup(',
+            '    ext_modules=[',
+            *['        ' + l for l in ext_lines],
+            '    ]',
+            ')',
+            '',
+        ])
+
+        #
+
+        return self.FileContents(
+            pyp_dct,
+            src,
+        )
+
+    def _write_file_contents(self) -> None:
+        fc = self.file_contents()
+
+        with open(os.path.join(self._pkg_dir(), 'pyproject.toml'), 'w') as f:
+            TomlWriter(f).write_root(fc.pyproject_dct)
 
-        return self._build_dir()
+        with open(os.path.join(self._pkg_dir(), 'setup.py'), 'w') as f:
+            f.write(fc.setup_py)

omdev/scripts/interp.py

@@ -1206,7 +1206,7 @@ class JsonLogFormatter(logging.Formatter):
 STANDARD_LOG_FORMAT_PARTS = [
     ('asctime', '%(asctime)-15s'),
     ('process', 'pid=%(process)-6s'),
-    ('thread', 'tid=%(thread)-16s'),
+    ('thread', 'tid=%(thread)-10x'),
     ('levelname', '%(levelname)-8s'),
     ('name', '%(name)s'),
     ('separator', '::'),

omdev/scripts/pyproject.py

@@ -86,6 +86,71 @@ UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
 CallableVersionOperator = ta.Callable[['Version', str], bool]
 
 
+########################################
+# ../../cexts/magic.py
+
+
+class CextMagic:
+    MAGIC = '@omdev-cext'
+    MAGIC_COMMENT = f'// {MAGIC}'
+
+    FILE_EXTENSIONS = ('c', 'cc', 'cpp')
+
+
+########################################
+# ../../findmagic.py
+# @omlish-script
+
+
+def compile_magic_pat(m: str) -> re.Pattern:
+    return re.compile('^' + re.escape(m) + r'($|(\s.*))')
+
+
+def find_magic(
+        roots: ta.Sequence[str],
+        magics: ta.Sequence[str],
+        exts: ta.Sequence[str],
+        *,
+        py: bool = False,
+) -> ta.Iterator[str]:
+    if not magics:
+        raise Exception('Must specify magics')
+    if not exts:
+        raise Exception('Must specify extensions')
+
+    pats = [compile_magic_pat(m) for m in magics]
+
+    for root in roots:
+        for dp, dns, fns in os.walk(root):  # noqa
+            for fn in fns:
+                if not any(fn.endswith(f'.{x}') for x in exts):
+                    continue
+
+                fp = os.path.join(dp, fn)
+                try:
+                    with open(fp) as f:
+                        src = f.read()
+                except UnicodeDecodeError:
+                    continue
+
+                if not any(
+                        any(pat.fullmatch(l) for pat in pats)
+                        for l in src.splitlines()
+                ):
+                    continue
+
+                if py:
+                    if fn == '__init__.py':
+                        out = dp.replace(os.sep, '.')
+                    elif fn.endswith('.py'):
+                        out = fp[:-3].replace(os.sep, '.')
+                    else:
+                        out = fp
+                else:
+                    out = fp
+                yield out
+
+
 ########################################
 # ../../toml/parser.py
 # SPDX-License-Identifier: MIT
@@ -1003,7 +1068,10 @@ class TomlWriter:
         elif isinstance(obj, ta.Mapping):
             self.write_inline_table(obj)
         elif isinstance(obj, ta.Sequence):
-            self.write_array(obj)
+            if not obj:
+                self.write_inline_array(obj)
+            else:
+                self.write_array(obj)
         else:
             raise TypeError(obj)
 
@@ -2405,7 +2473,7 @@ class JsonLogFormatter(logging.Formatter):
 STANDARD_LOG_FORMAT_PARTS = [
     ('asctime', '%(asctime)-15s'),
     ('process', 'pid=%(process)-6s'),
-    ('thread', 'tid=%(thread)-16s'),
+    ('thread', 'tid=%(thread)-10x'),
     ('levelname', '%(levelname)-8s'),
     ('name', '%(name)s'),
     ('separator', '::'),
@@ -3320,6 +3388,14 @@ TODO:
  - __revision__
  - entry_points
 
+** NOTE **
+setuptools now (2024/09/02) has experimental support for extensions in pure pyproject.toml - but we still want a
+separate '-cext' package
+  https://setuptools.pypa.io/en/latest/userguide/ext_modules.html
+  https://github.com/pypa/setuptools/commit/1a9d87308dc0d8aabeaae0dce989b35dfb7699f0#diff-61d113525e9cc93565799a4bb8b34a68e2945b8a3f7d90c81380614a4ea39542R7-R8
+
+--
+
 https://setuptools.pypa.io/en/latest/references/keywords.html
 https://packaging.python.org/en/latest/specifications/pyproject-toml
 
@@ -3331,19 +3407,25 @@ https://github.com/pypa/sampleproject/blob/db5806e0a3204034c51b1c00dde7d5eb3fa25
 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'
-"""
+"""  # noqa
 # ruff: noqa: UP006 UP007
 
 
-class PyprojectPackageGenerator:
+#
+
+
+class BasePyprojectPackageGenerator(abc.ABC):
     def __init__(
             self,
             dir_name: str,
-            build_root: str,
+            pkgs_root: str,
+            *,
+            pkg_suffix: str = '',
     ) -> None:
         super().__init__()
         self._dir_name = dir_name
-        self._build_root = build_root
+        self._pkgs_root = pkgs_root
+        self._pkg_suffix = pkg_suffix
 
     #
 
@@ -3351,48 +3433,44 @@ class PyprojectPackageGenerator:
     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 _pkg_dir(self) -> str:
+        pkg_dir: str = os.path.join(self._pkgs_root, self._dir_name + self._pkg_suffix)
+        if os.path.isdir(pkg_dir):
+            shutil.rmtree(pkg_dir)
+        os.makedirs(pkg_dir)
+        return pkg_dir
 
     #
 
+    _GIT_IGNORE: ta.Sequence[str] = [
+        '/*.egg-info/',
+        '/dist',
+    ]
+
     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))
+        with open(os.path.join(self._pkg_dir(), '.gitignore'), 'w') as f:
+            f.write('\n'.join(self._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),
+            os.path.relpath(self._dir_name, self._pkg_dir()),
+            os.path.join(self._pkg_dir(), self._dir_name),
         )
 
     #
 
-    @dc.dataclass(frozen=True)
-    class FileContents:
-        pyproject_dct: ta.Mapping[str, ta.Any]
-        manifest_in: ta.Optional[ta.Sequence[str]]
+    @cached_nullary
+    def project_cls(self) -> type:
+        return self.about().Project
+
+    @cached_nullary
+    def setuptools_cls(self) -> type:
+        return self.about().Setuptools
 
     @staticmethod
     def _build_cls_dct(cls: type) -> ta.Dict[str, ta.Any]:  # noqa
@@ -3414,18 +3492,115 @@ class PyprojectPackageGenerator:
         if sk in sd:
             dd[dk] = sd.pop(sk)
 
+    @dc.dataclass(frozen=True)
+    class Specs:
+        pyproject: ta.Dict[str, ta.Any]
+        setuptools: ta.Dict[str, ta.Any]
+
+    def build_specs(self) -> Specs:
+        return self.Specs(
+            self._build_cls_dct(self.project_cls()),
+            self._build_cls_dct(self.setuptools_cls()),
+        )
+
+    #
+
+    @abc.abstractmethod
+    def _write_file_contents(self) -> None:
+        raise NotImplementedError
+
+    #
+
+    _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._pkg_dir()), os.path.join(self._pkg_dir(), fn))
+
+    #
+
+    def _run_build(
+            self,
+            build_output_dir: ta.Optional[str] = None,
+            *,
+            add_revision: bool = False,
+    ) -> None:
+        subprocess.check_call(
+            [
+                sys.executable,
+                '-m',
+                'build',
+            ],
+            cwd=self._pkg_dir(),
+        )
+
+        dist_dir = os.path.join(self._pkg_dir(), 'dist')
+
+        if add_revision:
+            GitRevisionAdder().add_to(dist_dir)
+
+        if build_output_dir is not None:
+            for fn in os.listdir(dist_dir):
+                shutil.copyfile(os.path.join(dist_dir, fn), os.path.join(build_output_dir, fn))
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class GenOpts:
+        run_build: bool = False
+        build_output_dir: ta.Optional[str] = None
+        add_revision: bool = False
+
+    def gen(self, opts: GenOpts = GenOpts()) -> str:
+        log.info('Generating pyproject package: %s -> %s (%s)', self._dir_name, self._pkgs_root, self._pkg_suffix)
+
+        self._pkg_dir()
+        self._write_git_ignore()
+        self._symlink_source_dir()
+        self._write_file_contents()
+        self._symlink_standard_files()
+
+        if opts.run_build:
+            self._run_build(
+                opts.build_output_dir,
+                add_revision=opts.add_revision,
+            )
+
+        return self._pkg_dir()
+
+
+#
+
+
+class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class FileContents:
+        pyproject_dct: ta.Mapping[str, ta.Any]
+        manifest_in: ta.Optional[ta.Sequence[str]]
+
     @cached_nullary
     def file_contents(self) -> FileContents:
-        pyp_dct = {}
+        specs = self.build_specs()
 
         #
 
+        pyp_dct = {}
+
         pyp_dct['build-system'] = {
             'requires': ['setuptools'],
             'build-backend': 'setuptools.build_meta',
         }
 
-        prj = self._build_cls_dct(self.project_cls())
+        prj = specs.pyproject
+        prj['name'] += self._pkg_suffix
+
         pyp_dct['project'] = prj
 
         self._move_dict_key(prj, 'optional_dependencies', pyp_dct, extrask := 'project.optional-dependencies')
@@ -3441,9 +3616,11 @@ class PyprojectPackageGenerator:
 
         #
 
-        st = self._build_cls_dct(self.setuptools_cls())
+        st = specs.setuptools
         pyp_dct['tool.setuptools'] = st
 
+        st.pop('cexts', None)
+
         self._move_dict_key(st, 'find_packages', pyp_dct, 'tool.setuptools.packages.find')
 
         mani_in = st.pop('manifest_in', None)
@@ -3458,75 +3635,124 @@ class PyprojectPackageGenerator:
     def _write_file_contents(self) -> None:
         fc = self.file_contents()
 
-        with open(os.path.join(self._build_dir(), 'pyproject.toml'), 'w') as f:
+        with open(os.path.join(self._pkg_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:
+            with open(os.path.join(self._pkg_dir(), 'MANIFEST.in'), 'w') as f:
                 f.write('\n'.join(fc.manifest_in))  # noqa
 
     #
 
-    _STANDARD_FILES: ta.Sequence[str] = [
-        'LICENSE',
-        'README.rst',
-    ]
+    def gen(self, opts: BasePyprojectPackageGenerator.GenOpts = BasePyprojectPackageGenerator.GenOpts()) -> str:
+        ret = super().gen(opts)
 
-    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))
+        if self.build_specs().setuptools.get('cexts'):
+            _PyprojectCextPackageGenerator(
+                self._dir_name,
+                self._pkgs_root,
+                pkg_suffix='-cext',
+            ).gen(opts)
 
-    #
+        return ret
 
-    def _run_build(
-            self,
-            build_output_dir: ta.Optional[str] = None,
-            *,
-            add_revision: bool = False,
-    ) -> None:
-        subprocess.check_call(
-            [
-                sys.executable,
-                '-m',
-                'build',
-            ],
-            cwd=self._build_dir(),
-        )
 
-        dist_dir = os.path.join(self._build_dir(), 'dist')
+#
 
-        if add_revision:
-            GitRevisionAdder().add_to(dist_dir)
 
-        if build_output_dir is not None:
-            for fn in os.listdir(dist_dir):
-                shutil.copyfile(os.path.join(dist_dir, fn), os.path.join(build_output_dir, fn))
+class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
 
     #
 
-    def gen(
-            self,
-            *,
-            run_build: bool = False,
-            build_output_dir: ta.Optional[str] = None,
-            add_revision: bool = False,
-    ) -> str:
-        log.info('Generating pyproject package: %s -> %s', self._dir_name, self._build_root)
+    @cached_nullary
+    def find_cext_srcs(self) -> ta.Sequence[str]:
+        return sorted(find_magic(
+            [self._dir_name],
+            [CextMagic.MAGIC_COMMENT],
+            CextMagic.FILE_EXTENSIONS,
+        ))
 
-        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,
-                add_revision=add_revision,
-            )
+    @dc.dataclass(frozen=True)
+    class FileContents:
+        pyproject_dct: ta.Mapping[str, ta.Any]
+        setup_py: str
+
+    @cached_nullary
+    def file_contents(self) -> FileContents:
+        specs = self.build_specs()
+
+        #
+
+        pyp_dct = {}
+
+        pyp_dct['build-system'] = {
+            'requires': ['setuptools'],
+            'build-backend': 'setuptools.build_meta',
+        }
+
+        prj = specs.pyproject
+        prj['dependencies'] = [f'{prj["name"]} == {prj["version"]}']
+        prj['name'] += self._pkg_suffix
+        prj.pop('optional_dependencies', None)
+
+        pyp_dct['project'] = prj
+
+        #
+
+        st = specs.setuptools
+        pyp_dct['tool.setuptools'] = st
+
+        st.pop('cexts', None)
+        st.pop('find_packages', None)
+        st.pop('manifest_in', None)
+
+        pyp_dct['tool.setuptools.packages.find'] = {
+            'include': [],
+        }
+
+        #
+
+        ext_lines = []
+
+        for ext_src in self.find_cext_srcs():
+            ext_name = ext_src.rpartition('.')[0].replace(os.sep, '.')
+            ext_lines.extend([
+                'st.Extension(',
+                f"    name='{ext_name}',",
+                f"    sources=['{ext_src}'],",
+                "    extra_compile_args=['-std=c++20'],",
+                '),',
+            ])
+
+        src = '\n'.join([
+            'import setuptools as st',
+            '',
+            '',
+            'st.setup(',
+            '    ext_modules=[',
+            *['        ' + l for l in ext_lines],
+            '    ]',
+            ')',
+            '',
+        ])
+
+        #
+
+        return self.FileContents(
+            pyp_dct,
+            src,
+        )
+
+    def _write_file_contents(self) -> None:
+        fc = self.file_contents()
+
+        with open(os.path.join(self._pkg_dir(), 'pyproject.toml'), 'w') as f:
+            TomlWriter(f).write_root(fc.pyproject_dct)
 
-        return self._build_dir()
+        with open(os.path.join(self._pkg_dir(), 'setup.py'), 'w') as f:
+            f.write(fc.setup_py)
 
 
 ########################################
@@ -4363,10 +4589,10 @@ def _pkg_cmd(args) -> None:
         raise Exception('must specify command')
 
     elif cmd == 'gen':
-        build_root = os.path.join('.pkg')
+        pkgs_root = os.path.join('.pkg')
 
-        if os.path.exists(build_root):
-            shutil.rmtree(build_root)
+        if os.path.exists(pkgs_root):
+            shutil.rmtree(pkgs_root)
 
         build_output_dir = 'dist'
         run_build = bool(args.build)
@@ -4381,11 +4607,13 @@ def _pkg_cmd(args) -> None:
                 ex.submit(functools.partial(
                     PyprojectPackageGenerator(
                         dir_name,
-                        build_root,
+                        pkgs_root,
                     ).gen,
-                    run_build=run_build,
-                    build_output_dir=build_output_dir,
-                    add_revision=add_revision,
+                    PyprojectPackageGenerator.GenOpts(
+                        run_build=run_build,
+                        build_output_dir=build_output_dir,
+                        add_revision=add_revision,
+                    ),
                 ))
                 for dir_name in run.cfg().pkgs
             ]

omdev/toml/writer.py

@@ -99,6 +99,9 @@ class TomlWriter:
         elif isinstance(obj, ta.Mapping):
             self.write_inline_table(obj)
         elif isinstance(obj, ta.Sequence):
-            self.write_array(obj)
+            if not obj:
+                self.write_inline_array(obj)
+            else:
+                self.write_array(obj)
         else:
             raise TypeError(obj)

{omdev-0.0.0.dev17.dist-info → omdev-0.0.0.dev19.dist-info}/METADATA

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

{omdev-0.0.0.dev17.dist-info → omdev-0.0.0.dev19.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/__about__.py,sha256=VuY8DTDYJifMW_xeF21JIhFM-MwVp1F0vWUhzIqomJA,784
+omdev/__about__.py,sha256=x1427IilNX73BS7VDiNwnCFDuzGfPVPoRvJze6stnsE,802
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=HwBK5XmlOsF_juTel25fRLJK9vHSJCWXuCc-OZlevRQ,2619
 omdev/classdot.py,sha256=urN5Pzd2ooAwnfkH0z-muQxdO90IMo-sX2WB-A37lVU,1533
@@ -12,9 +12,10 @@ omdev/amalg/__main__.py,sha256=OE1udULO1g4McUbeg1CoHbSm4hbQ2kcE3ffEGxlnPh4,69
 omdev/amalg/amalg.py,sha256=YEyH097MZop-f1qobZJW__srtyLFS3rI7M2MaRtshKg,13057
 omdev/cexts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cexts/build.py,sha256=zViF1wYx6z5ACyifgNjlCAVoPAMCKpTr_VoAvwtmvtY,1013
-omdev/cexts/cmake.py,sha256=7-teRL_PAAhg11upu2S93abd3zAEXz3Tjk9PlCB8oAM,10121
+omdev/cexts/cmake.py,sha256=WrH5l3WnamyVEcMMjxkX87bNT7O7ZWX-docajc7XwAg,9726
 omdev/cexts/importhook.py,sha256=nljqEuPopuh10DPeSrIYKmkV4z-Wk5Q7WpUid1JEmkg,3530
-omdev/cexts/scan.py,sha256=lYb-0622Bd18aQGMxN_EmqrT5lUPzCe0GuXFbYSuL38,1641
+omdev/cexts/magic.py,sha256=LhC31I2GiCq3NRU5dpy_9do6IVjhdGu58uPPFffQx5Q,135
+omdev/cexts/scan.py,sha256=_U5DX9ksHP1845PdGxWh4Rf1a6x_sG1MH3uL_hwBnKY,1669
 omdev/cexts/_distutils/__init__.py,sha256=c1zImtnPh3uY8BUTV4RLKtGKqTPx3c_pBbhA6tPtNsE,297
 omdev/cexts/_distutils/build_ext.py,sha256=STHl9Rq2KeWJ3dQ8j8LwIQ-vFc4-3XsYWQ8Qc5_VByU,13833
 omdev/cexts/_distutils/dir_util.py,sha256=xxfAIPHbjlh-aW9OX6UGDrXiXfB5biG4xEC5RA6oszM,2882
@@ -47,17 +48,17 @@ omdev/precheck/__main__.py,sha256=wKF_2KP2Yn1hKDEOCGR_fm5zu9UHMWCZtuEmWjpprrU,72
 omdev/precheck/precheck.py,sha256=2yTjNGvjPYf3QxUBbCbehBYYuB8gDR_dYSTrlNCs9qU,8322
 omdev/pyproject/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/pyproject/__main__.py,sha256=gFhR9DikwDZk0LqgdR3qq_aXQHThUOPllDmHDOfnFAU,67
-omdev/pyproject/cli.py,sha256=ywK2RyovwgwameZfXrvZylzZ87KQ0RDhzEAljKi7qv8,9918
+omdev/pyproject/cexts.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
+omdev/pyproject/cli.py,sha256=RnRj8zfGGUcLJ-oiQS90gR2O0XAH4iwNSX5JIDWzM4U,10004
 omdev/pyproject/configs.py,sha256=MFHnmpMjlwxw74-SyX1Q1qNQ4ptwTXEzDGkeUcGY0mA,2822
-omdev/pyproject/ext.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
-omdev/pyproject/pkg.py,sha256=YrnqZK-b2qJh6kSkvYjZ19F39NU0kpbth1FYItpFZ80,5977
+omdev/pyproject/pkg.py,sha256=_uPJNU9i3zbtZ8yw6h0ZTEGtEVJp07EacdHFs3jMMHM,9862
 omdev/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/scripts/execrss.py,sha256=HzDNmwXOO8fMwIRXw9q8CUnVfLFCQASyU2tfY_y2Vf8,324
-omdev/scripts/interp.py,sha256=Xuj509nGwClnR4MvnB8CJJQ7KhfjdGmzN9ul17-SXjI,63069
-omdev/scripts/pyproject.py,sha256=JwEjizuEdKH0TOzfqlfQ0NYkQ3KqzUg-8FtS6lR_-F8,134057
+omdev/scripts/interp.py,sha256=fLO1WXW6_3zr6VlyM9om7RNRtG1yj2TPZpNHOYKfk98,63069
+omdev/scripts/pyproject.py,sha256=3-skV2FFYDPI2TeXQ9DzfS_BFBjmghFFhVcPVLHVlac,139733
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/toml/parser.py,sha256=84bn09uhYHwQGyfww6Rw6y1RxPAE_HDltODOSakcqDM,29186
-omdev/toml/writer.py,sha256=StGYPvqgN__A2IxTI4rYeHMx8dLAFt8uogHG8dJdShs,2781
+omdev/toml/writer.py,sha256=dwz_Qw8z5Z_nmWpXqch63W6S_j6n256erb7AGFTVzB4,2872
 omdev/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/dockertools.py,sha256=3844AhUst6kYo2xKNn-2Npi-f6r4rocxEOx0tHjE0dk,2063
 omdev/tools/gittools.py,sha256=zPy2D5WDs-CbwT86_T_hbaq5yCuss5e-ouUccXC6xlg,578
@@ -67,8 +68,8 @@ omdev/tools/traceimport.py,sha256=oDry9CwIv5h96wSaTVKJ0qQ5vMGxYE5oBtfF-GYNLJs,13
 omdev/versioning/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/versioning/specifiers.py,sha256=6Odf9e6farwlPRsD_YqwTfYKG-BXn_dIcKtqfkhfodI,17432
 omdev/versioning/versions.py,sha256=ei2eopEsJq3zSMJmezK1nzZgikgCdxFtnF3f69nCRZQ,12246
-omdev-0.0.0.dev17.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev17.dist-info/METADATA,sha256=F2d1GkBDHzyYWkvB6pP2vKL0cIljcGVEAEeiFgZm1pc,1126
-omdev-0.0.0.dev17.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-omdev-0.0.0.dev17.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev17.dist-info/RECORD,,
+omdev-0.0.0.dev19.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev19.dist-info/METADATA,sha256=k0Elh8TPD7dB1z2dwbDPyQ_-GUOLna4LW_oPSYlmNB0,1126
+omdev-0.0.0.dev19.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+omdev-0.0.0.dev19.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev19.dist-info/RECORD,,