omdev 0.0.0.dev464__tar.gz → 0.0.0.dev466__tar.gz

{omdev-0.0.0.dev464/omdev.egg-info → omdev-0.0.0.dev466}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev464
+Version: 0.0.0.dev466
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev464
+Requires-Dist: omlish==0.0.0.dev466
 Provides-Extra: all
 Requires-Dist: black~=25.9; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"

{omdev-0.0.0.dev464 → omdev-0.0.0.dev466}/omdev/__about__.py

@@ -58,7 +58,8 @@ class Project(ProjectBase):
 
 
 class Setuptools(SetuptoolsBase):
-    cexts = True
+    cext = True
+    rs = True
 
     find_packages = {
         'include': [Project.name, f'{Project.name}.*'],

{omdev-0.0.0.dev464 → omdev-0.0.0.dev466}/omdev/pyproject/pkg.py

@@ -28,10 +28,12 @@ vcs+protocol://repo_url/#egg=pkg&subdirectory=pkg_dir
 import abc
 import dataclasses as dc
 import importlib
+import inspect
 import os.path
 import shutil
 import sys
 import tempfile
+import textwrap
 import types
 import typing as ta
 
@@ -260,6 +262,7 @@ class BasePyprojectPackageGenerator(Abstract):
                 )
 
         if output_dir is not None:
+            log.info(lambda: f'Copying {dist_dir} to {output_dir}')
             for fn in os.listdir(dist_dir):
                 shutil.copyfile(os.path.join(dist_dir, fn), os.path.join(output_dir, fn))
 
@@ -315,7 +318,11 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         st = dict(specs.setuptools)
         pyp_dct['tool.setuptools'] = st
 
-        st.pop('cexts', None)
+        for k in [
+            'cext',
+            'rs',
+        ]:
+            st.pop(k, None)
 
         #
 
@@ -388,13 +395,20 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
     def children(self) -> ta.Sequence[BasePyprojectPackageGenerator]:
         out: ta.List[BasePyprojectPackageGenerator] = []
 
-        if self.build_specs().setuptools.get('cexts'):
+        if self.build_specs().setuptools.get('cext'):
             out.append(_PyprojectCextPackageGenerator(
                 self._dir_name,
                 self._pkgs_root,
                 pkg_suffix='-cext',
             ))
 
+        if self.build_specs().setuptools.get('rs'):
+            out.append(_PyprojectRsPackageGenerator(
+                self._dir_name,
+                self._pkgs_root,
+                pkg_suffix='-rs',
+            ))
+
         if self.build_specs().pyproject.get('cli_scripts'):
             out.append(_PyprojectCliPackageGenerator(
                 self._dir_name,
@@ -405,10 +419,67 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         return out
 
 
-#
+##
 
 
-class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
+class _PyprojectExtensionPackageGenerator(BasePyprojectPackageGenerator, Abstract):
+    #
+
+    def _build_project_dict(self) -> ta.Dict[str, ta.Any]:
+        prj = dict(self.build_specs().pyproject)
+
+        prj['dependencies'] = [f'{prj["name"]} == {prj["version"]}']
+        prj['name'] += self._pkg_suffix
+
+        for k in [
+            'optional_dependencies',
+            'entry_points',
+            'scripts',
+            'cli_scripts',
+        ]:
+            prj.pop(k, None)
+
+        return prj
+
+    def _build_setuptools_dict(self) -> ta.Dict[str, ta.Any]:
+        st = dict(self.build_specs().setuptools)
+
+        for k in [
+            'cext',
+            'rs',
+
+            'find_packages',
+            'package_data',
+            'manifest_in',
+        ]:
+            st.pop(k, None)
+
+        return st
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class FileContents:
+        pyproject_dct: ta.Mapping[str, ta.Any]
+        setup_py: str
+
+    @abc.abstractmethod
+    def file_contents(self) -> FileContents:
+        raise NotImplementedError
+
+    #
+
+    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)
+
+        with open(os.path.join(self._pkg_dir(), 'setup.py'), 'w') as f:
+            f.write(fc.setup_py)
+
+
+class _PyprojectCextPackageGenerator(_PyprojectExtensionPackageGenerator):
     @cached_nullary
     def find_cext_srcs(self) -> ta.Sequence[str]:
         return sorted(find_magic_files(
@@ -419,14 +490,10 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
 
     #
 
-    @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()
+    def file_contents(self) -> _PyprojectExtensionPackageGenerator.FileContents:
+        prj = self._build_project_dict()
+        st = self._build_setuptools_dict()
 
         #
 
@@ -437,33 +504,9 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
             'build-backend': 'setuptools.build_meta',
         }
 
-        prj = specs.pyproject
-        prj['dependencies'] = [f'{prj["name"]} == {prj["version"]}']
-        prj['name'] += self._pkg_suffix
-        for k in [
-            'optional_dependencies',
-            'entry_points',
-            'scripts',
-            'cli_scripts',
-        ]:
-            prj.pop(k, None)
-
         pyp_dct['project'] = prj
-
-        #
-
-        st = dict(specs.setuptools)
         pyp_dct['tool.setuptools'] = st
 
-        for k in [
-            'cexts',
-
-            'find_packages',
-            'package_data',
-            'manifest_in',
-        ]:
-            st.pop(k, None)
-
         pyp_dct['tool.setuptools.packages.find'] = {
             'include': [],
         }
@@ -501,14 +544,110 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
             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)
+class _PyprojectRsPackageGenerator(_PyprojectExtensionPackageGenerator):
+    @cached_nullary
+    def find_rs_dirs(self) -> ta.Sequence[str]:
+        return sorted(
+            dp
+            for dp, dns, fns in os.walk(self._dir_name)
+            for fn in fns
+            if fn == '.omlish-rs-ext'
+        )
 
-        with open(os.path.join(self._pkg_dir(), 'setup.py'), 'w') as f:
-            f.write(fc.setup_py)
+    #
+
+    @staticmethod
+    def _sdist_patch_body() -> None:
+        def _patch_sdist():
+            def _sdist_add_defaults(old, self):
+                import os.path
+
+                old(self)
+
+                if self.distribution.rust_extensions and len(self.distribution.rust_extensions) > 0:
+                    build_rust = self.get_finalized_command('build_rust')  # noqa
+                    for ext in build_rust.extensions:
+                        ext_dir = os.path.dirname(ext.path)
+                        for n in os.listdir(ext_dir):
+                            if n.startswith('.') or n == 'target':
+                                continue
+                            p = os.path.join(ext_dir, n)
+                            if os.path.isfile(p):
+                                self.filelist.append(p)
+                            elif os.path.isdir(p):
+                                self.filelist.extend(os.path.join(dp, f) for dp, dn, fn in os.walk(p) for f in fn)
+
+            # Sadly, we can't just subclass sdist and override it via cmdclass because manifest_maker calls
+            # `sdist.add_defaults` as an unbound function, not a bound method:
+            # https://github.com/pypa/setuptools/blob/9c4d383631d3951fcae0afd73b5d08ff5a262976/setuptools/command/egg_info.py#L581
+            from setuptools.command.sdist import sdist  # noqa
+            sdist.add_defaults = (lambda old: lambda sdist: _sdist_add_defaults(old, sdist))(sdist.add_defaults)  # noqa
+
+        _patch_sdist()
+
+    @cached_nullary
+    def sdist_patch_code(self) -> str:
+        return textwrap.dedent(''.join(inspect.getsource(self._sdist_patch_body).splitlines(keepends=True)[2:])).strip()
+
+    #
+
+    @cached_nullary
+    def file_contents(self) -> _PyprojectExtensionPackageGenerator.FileContents:
+        prj = self._build_project_dict()
+        st = self._build_setuptools_dict()
+
+        #
+
+        pyp_dct = {}
+
+        pyp_dct['build-system'] = {
+            'requires': ['setuptools', 'setuptools-rust'],
+            'build-backend': 'setuptools.build_meta',
+        }
+
+        pyp_dct['project'] = prj
+        pyp_dct['tool.setuptools'] = st
+
+        pyp_dct['tool.setuptools.packages.find'] = {
+            'include': [],
+        }
+
+        #
+
+        ext_lines: list = []
+
+        for ext_dir in self.find_rs_dirs():  # noqa
+            ext_name = ext_dir.replace(os.sep, '.')
+            ext_lines.extend([
+                'st_rs.RustExtension(',
+                f"    '{ext_name}',",
+                f"    path='{ext_dir}/Cargo.toml',",
+                '),',
+            ])
+
+        src = '\n'.join([
+            'import setuptools as st',
+            'import setuptools_rust as st_rs',
+            '',
+            '',
+            self.sdist_patch_code(),
+            '',
+            '',
+            'st.setup(',
+            '    rust_extensions=[',
+            *['        ' + l for l in ext_lines],
+            '    ],',
+            ')',
+            '',
+        ])
+
+        #
+
+        return self.FileContents(
+            pyp_dct,
+            src,
+        )
 
 
 ##
@@ -553,7 +692,8 @@ class _PyprojectCliPackageGenerator(BasePyprojectPackageGenerator):
         pyp_dct['tool.setuptools'] = st
 
         for k in [
-            'cexts',
+            'cext',
+            'rs',
 
             'find_packages',
             'package_data',

{omdev-0.0.0.dev464 → omdev-0.0.0.dev466}/omdev/scripts/pyproject.py

@@ -65,6 +65,7 @@ import subprocess
 import sys
 import tarfile
 import tempfile
+import textwrap
 import threading
 import time
 import traceback
@@ -11016,6 +11017,7 @@ class BasePyprojectPackageGenerator(Abstract):
                 )
 
         if output_dir is not None:
+            log.info(lambda: f'Copying {dist_dir} to {output_dir}')
             for fn in os.listdir(dist_dir):
                 shutil.copyfile(os.path.join(dist_dir, fn), os.path.join(output_dir, fn))
 
@@ -11071,7 +11073,11 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         st = dict(specs.setuptools)
         pyp_dct['tool.setuptools'] = st
 
-        st.pop('cexts', None)
+        for k in [
+            'cext',
+            'rs',
+        ]:
+            st.pop(k, None)
 
         #
 
@@ -11144,13 +11150,20 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
     def children(self) -> ta.Sequence[BasePyprojectPackageGenerator]:
         out: ta.List[BasePyprojectPackageGenerator] = []
 
-        if self.build_specs().setuptools.get('cexts'):
+        if self.build_specs().setuptools.get('cext'):
             out.append(_PyprojectCextPackageGenerator(
                 self._dir_name,
                 self._pkgs_root,
                 pkg_suffix='-cext',
             ))
 
+        if self.build_specs().setuptools.get('rs'):
+            out.append(_PyprojectRsPackageGenerator(
+                self._dir_name,
+                self._pkgs_root,
+                pkg_suffix='-rs',
+            ))
+
         if self.build_specs().pyproject.get('cli_scripts'):
             out.append(_PyprojectCliPackageGenerator(
                 self._dir_name,
@@ -11161,10 +11174,67 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         return out
 
 
-#
+##
 
 
-class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
+class _PyprojectExtensionPackageGenerator(BasePyprojectPackageGenerator, Abstract):
+    #
+
+    def _build_project_dict(self) -> ta.Dict[str, ta.Any]:
+        prj = dict(self.build_specs().pyproject)
+
+        prj['dependencies'] = [f'{prj["name"]} == {prj["version"]}']
+        prj['name'] += self._pkg_suffix
+
+        for k in [
+            'optional_dependencies',
+            'entry_points',
+            'scripts',
+            'cli_scripts',
+        ]:
+            prj.pop(k, None)
+
+        return prj
+
+    def _build_setuptools_dict(self) -> ta.Dict[str, ta.Any]:
+        st = dict(self.build_specs().setuptools)
+
+        for k in [
+            'cext',
+            'rs',
+
+            'find_packages',
+            'package_data',
+            'manifest_in',
+        ]:
+            st.pop(k, None)
+
+        return st
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class FileContents:
+        pyproject_dct: ta.Mapping[str, ta.Any]
+        setup_py: str
+
+    @abc.abstractmethod
+    def file_contents(self) -> FileContents:
+        raise NotImplementedError
+
+    #
+
+    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)
+
+        with open(os.path.join(self._pkg_dir(), 'setup.py'), 'w') as f:
+            f.write(fc.setup_py)
+
+
+class _PyprojectCextPackageGenerator(_PyprojectExtensionPackageGenerator):
     @cached_nullary
     def find_cext_srcs(self) -> ta.Sequence[str]:
         return sorted(find_magic_files(
@@ -11175,14 +11245,10 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
 
     #
 
-    @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()
+    def file_contents(self) -> _PyprojectExtensionPackageGenerator.FileContents:
+        prj = self._build_project_dict()
+        st = self._build_setuptools_dict()
 
         #
 
@@ -11193,33 +11259,9 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
             'build-backend': 'setuptools.build_meta',
         }
 
-        prj = specs.pyproject
-        prj['dependencies'] = [f'{prj["name"]} == {prj["version"]}']
-        prj['name'] += self._pkg_suffix
-        for k in [
-            'optional_dependencies',
-            'entry_points',
-            'scripts',
-            'cli_scripts',
-        ]:
-            prj.pop(k, None)
-
         pyp_dct['project'] = prj
-
-        #
-
-        st = dict(specs.setuptools)
         pyp_dct['tool.setuptools'] = st
 
-        for k in [
-            'cexts',
-
-            'find_packages',
-            'package_data',
-            'manifest_in',
-        ]:
-            st.pop(k, None)
-
         pyp_dct['tool.setuptools.packages.find'] = {
             'include': [],
         }
@@ -11257,14 +11299,110 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
             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)
+class _PyprojectRsPackageGenerator(_PyprojectExtensionPackageGenerator):
+    @cached_nullary
+    def find_rs_dirs(self) -> ta.Sequence[str]:
+        return sorted(
+            dp
+            for dp, dns, fns in os.walk(self._dir_name)
+            for fn in fns
+            if fn == '.omlish-rs-ext'
+        )
 
-        with open(os.path.join(self._pkg_dir(), 'setup.py'), 'w') as f:
-            f.write(fc.setup_py)
+    #
+
+    @staticmethod
+    def _sdist_patch_body() -> None:
+        def _patch_sdist():
+            def _sdist_add_defaults(old, self):
+                import os.path
+
+                old(self)
+
+                if self.distribution.rust_extensions and len(self.distribution.rust_extensions) > 0:
+                    build_rust = self.get_finalized_command('build_rust')  # noqa
+                    for ext in build_rust.extensions:
+                        ext_dir = os.path.dirname(ext.path)
+                        for n in os.listdir(ext_dir):
+                            if n.startswith('.') or n == 'target':
+                                continue
+                            p = os.path.join(ext_dir, n)
+                            if os.path.isfile(p):
+                                self.filelist.append(p)
+                            elif os.path.isdir(p):
+                                self.filelist.extend(os.path.join(dp, f) for dp, dn, fn in os.walk(p) for f in fn)
+
+            # Sadly, we can't just subclass sdist and override it via cmdclass because manifest_maker calls
+            # `sdist.add_defaults` as an unbound function, not a bound method:
+            # https://github.com/pypa/setuptools/blob/9c4d383631d3951fcae0afd73b5d08ff5a262976/setuptools/command/egg_info.py#L581
+            from setuptools.command.sdist import sdist  # noqa
+            sdist.add_defaults = (lambda old: lambda sdist: _sdist_add_defaults(old, sdist))(sdist.add_defaults)  # noqa
+
+        _patch_sdist()
+
+    @cached_nullary
+    def sdist_patch_code(self) -> str:
+        return textwrap.dedent(''.join(inspect.getsource(self._sdist_patch_body).splitlines(keepends=True)[2:])).strip()
+
+    #
+
+    @cached_nullary
+    def file_contents(self) -> _PyprojectExtensionPackageGenerator.FileContents:
+        prj = self._build_project_dict()
+        st = self._build_setuptools_dict()
+
+        #
+
+        pyp_dct = {}
+
+        pyp_dct['build-system'] = {
+            'requires': ['setuptools', 'setuptools-rust'],
+            'build-backend': 'setuptools.build_meta',
+        }
+
+        pyp_dct['project'] = prj
+        pyp_dct['tool.setuptools'] = st
+
+        pyp_dct['tool.setuptools.packages.find'] = {
+            'include': [],
+        }
+
+        #
+
+        ext_lines: list = []
+
+        for ext_dir in self.find_rs_dirs():  # noqa
+            ext_name = ext_dir.replace(os.sep, '.')
+            ext_lines.extend([
+                'st_rs.RustExtension(',
+                f"    '{ext_name}',",
+                f"    path='{ext_dir}/Cargo.toml',",
+                '),',
+            ])
+
+        src = '\n'.join([
+            'import setuptools as st',
+            'import setuptools_rust as st_rs',
+            '',
+            '',
+            self.sdist_patch_code(),
+            '',
+            '',
+            'st.setup(',
+            '    rust_extensions=[',
+            *['        ' + l for l in ext_lines],
+            '    ],',
+            ')',
+            '',
+        ])
+
+        #
+
+        return self.FileContents(
+            pyp_dct,
+            src,
+        )
 
 
 ##
@@ -11309,7 +11447,8 @@ class _PyprojectCliPackageGenerator(BasePyprojectPackageGenerator):
         pyp_dct['tool.setuptools'] = st
 
         for k in [
-            'cexts',
+            'cext',
+            'rs',
 
             'find_packages',
             'package_data',

{omdev-0.0.0.dev464 → omdev-0.0.0.dev466/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev464
+Version: 0.0.0.dev466
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev464
+Requires-Dist: omlish==0.0.0.dev466
 Provides-Extra: all
 Requires-Dist: black~=25.9; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"

{omdev-0.0.0.dev464 → omdev-0.0.0.dev466}/omdev.egg-info/SOURCES.txt

@@ -282,7 +282,6 @@ omdev/py/tools/importscan.py
 omdev/py/tools/mkrelimp.py
 omdev/pyproject/__init__.py
 omdev/pyproject/__main__.py
-omdev/pyproject/cexts.py
 omdev/pyproject/cli.py
 omdev/pyproject/configs.py
 omdev/pyproject/inject.py
@@ -292,6 +291,7 @@ omdev/pyproject/venvs.py
 omdev/pyproject/resources/__init__.py
 omdev/pyproject/resources/docker-dev.sh
 omdev/pyproject/resources/python.sh
+omdev/rs/__init__.py
 omdev/scripts/__init__.py
 omdev/scripts/ci.py
 omdev/scripts/interp.py

{omdev-0.0.0.dev464 → omdev-0.0.0.dev466}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev464
+omlish==0.0.0.dev466
 
 [all]
 black~=25.9

{omdev-0.0.0.dev464 → omdev-0.0.0.dev466}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev464'
+version = '0.0.0.dev466'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev464',
+    'omlish == 0.0.0.dev466',
 ]
 
 [project.optional-dependencies]