Large refactor to be a modular hatchling + meson project

Author: virtuald

pyproject.toml

@@ -18,29 +18,30 @@ classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: BSD License",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
     "Topic :: Software Development",
 ]
 dependencies = [
-    "setuptools >= 45",
-    "setuptools_scm >= 6.2, < 8",
+    "pkgconf",
     "sphinxify >= 0.7.3",
     "validobj ~= 1.2",
-    "cxxheaderparser[pcpp] ~= 1.4.1",
+    "cxxheaderparser[pcpp] ~= 1.5",
     "tomli",
     "tomli_w",
     "toposort",
     "typing-extensions",
+    "validobj",
     "pyyaml >= 5.1",
-    "patch == 1.*",
     "pybind11-stubgen ~= 2.5.1",
     "delocate; platform_system == 'Darwin'",
     "distro; platform_system == 'Linux'",
 ]
 
+[project.entry-points.hatch]
+semiwrap = "semiwrap.hooks"
+
+[project.entry-points.pkg_config]
+semiwrap = "semiwrap"
+
 [project.scripts]
 semiwrap = "semiwrap.tool.__main__:main"
 
@@ -50,7 +51,7 @@ semiwrap = "semiwrap.tool.__main__:main"
 [tool.hatch.version]
 source = "vcs"
 
-[tool.hatch.build.hooks.vcs]
+[tool.hatch.build.targets.sdist.hooks.vcs]
 version-file = "src/semiwrap/version.py"
 
 [tool.hatch.build.targets.sdist]
@@ -61,13 +62,6 @@ exclude = [
 [tool.hatch.build.targets.sdist.force-include]
 "./src/semiwrap/pybind11/include" = "./semiwrap/pybind11/include"
 
-[tool.hatch.build.targets.wheel]
-packages = ["semiwrap"]
-include = [
-    "/semiwrap/pybind11/include",
-    "/semiwrap/include",
-]
-
 
 [tool.black]
 target-version = ["py38"]

src/semiwrap/autowrap/context.py

@@ -12,6 +12,7 @@
 
 from dataclasses import dataclass, field
 import enum
+import pathlib
 import typing
 
 from cxxheaderparser.types import Function, PQName
@@ -372,6 +373,9 @@ class ClassContext:
 
     parent: typing.Optional["ClassContext"]
 
+    #: lookup key for dat2trampoline
+    yml_id: str
+
     #: Namespace that this class lives in
     namespace: str
 
@@ -514,6 +518,9 @@ class HeaderContext:
     # Name in toml
     hname: str
 
+    # config file for this
+    orig_yaml: pathlib.Path
+
     extra_includes_first: typing.List[str]
     extra_includes: typing.List[str]
     inline_code: typing.Optional[str]
@@ -535,6 +542,9 @@ class HeaderContext:
     # same as classes, but only those that have trampolines
     classes_with_trampolines: typing.List[ClassContext] = field(default_factory=list)
 
+    # for diagnostic purposes
+    ignored_classes: typing.List[str] = field(default_factory=list)
+
     functions: typing.List[FunctionContext] = field(default_factory=list)
 
     # trampolines

src/semiwrap/autowrap/cxxparser.py

@@ -58,6 +58,7 @@
     Variable,
 )
 
+from ..casters import CastersData
 from ..config.autowrap_yml import (
     AutowrapConfigYaml,
     BufferData,
@@ -87,18 +88,24 @@
     TrampolineData,
 )
 
+from ..util import relpath_walk_up
+
 
 class HasSubpackage(Protocol):
-    subpackage: typing.Optional[str]
+    @property
+    def subpackage(self) -> typing.Optional[str]: ...
 
 
 class HasDoc(Protocol):
-    doc: str
-    doc_append: str
+    @property
+    def doc(self) -> typing.Optional[str]: ...
+    @property
+    def doc_append(self) -> typing.Optional[str]: ...
 
 
 class HasNameData(Protocol):
-    rename: str
+    @property
+    def rename(self) -> typing.Optional[str]: ...
 
 
 # TODO: this isn't the best solution
@@ -329,7 +336,7 @@ def __init__(
         self,
         hctx: HeaderContext,
         gendata: GeneratorData,
-        casters: typing.Dict[str, typing.Dict[str, typing.Any]],
+        casters: CastersData,
         report_only: bool,
     ) -> None:
         self.hctx = hctx
@@ -591,6 +598,7 @@ def on_class_start(self, state: AWClassBlockState) -> typing.Optional[bool]:
 
         # Ignore explicitly ignored classes (including default-ignore)
         if class_data.ignore:
+            self.hctx.ignored_classes.append(cls_key)
             return False
 
         if missing and not self.report_only:
@@ -721,6 +729,7 @@ def on_class_start(self, state: AWClassBlockState) -> typing.Optional[bool]:
 
         ctx = ClassContext(
             parent=parent_ctx,
+            yml_id=cls_key,
             namespace=cls_namespace,
             cpp_name=cls_name,
             full_cpp_name=cls_qualname,
@@ -1897,8 +1906,8 @@ def _add_default_arg_cast(
             typename = _fmt_nameonly(ntype.typename)
             if typename:
                 ccfg = self.casters.get(typename)
-                if ccfg and ccfg.get("darg"):
-                    found_typename = ccfg["typename"]
+                if ccfg and ccfg.default_arg_cast:
+                    found_typename = ccfg.typename
                     name = f"({found_typename}){name}"
 
         return name
@@ -1974,7 +1983,7 @@ def _set_type_caster_includes(self):
         for typename in self.types:
             ccfg = casters.get(typename)
             if ccfg:
-                includes.add(ccfg["hdr"])
+                includes.add(ccfg.header)
 
         self.hctx.type_caster_includes = sorted(includes)
 
@@ -1985,18 +1994,19 @@ def parse_header(
     header_root: pathlib.Path,
     gendata: GeneratorData,
     parser_options: ParserOptions,
-    casters: typing.Dict[str, typing.Dict[str, typing.Any]],
+    casters: CastersData,
     report_only: bool,
 ) -> HeaderContext:
     user_cfg = gendata.data
 
     # Initialize the header context with user configuration
     hctx = HeaderContext(
         hname=name,
+        orig_yaml=gendata.data_fname,
         extra_includes_first=user_cfg.extra_includes_first,
         extra_includes=user_cfg.extra_includes,
         inline_code=user_cfg.inline_code,
-        rel_fname=str(header_path.relative_to(header_root)),
+        rel_fname=relpath_walk_up(header_path, header_root).as_posix(),
     )
 
     # Parse the header using a custom visitor

src/semiwrap/autowrap/generator_data.py

@@ -13,7 +13,8 @@
 from cxxheaderparser.types import Function
 
 import dataclasses
-from typing import Dict, List, Optional, Tuple
+import pathlib
+from typing import Any, Dict, List, Optional, Tuple
 
 
 @dataclasses.dataclass
@@ -66,7 +67,7 @@ class GeneratorData:
 
     data: AutowrapConfigYaml
 
-    def __init__(self, data: AutowrapConfigYaml, data_fname: str):
+    def __init__(self, data: AutowrapConfigYaml, data_fname: pathlib.Path):
         self.data = data
         self.data_fname = data_fname
 
@@ -202,7 +203,7 @@ def get_prop_data(self, name) -> PropData:
 
         return data
 
-    def report_missing(self, name: str, reporter: "MissingReporter"):
+    def report_missing(self, name: pathlib.Path, reporter: "MissingReporter"):
         """
         Generate a structure that can be copy/pasted into the generation
         data yaml and print it out if there's missing data
@@ -356,6 +357,9 @@ class MissingReporter:
     def __init__(self):
         self.reports = {}
 
+    def __bool__(self) -> bool:
+        return len(self.reports) > 0
+
     def _merge(self, src, dst):
         for k, v in src.items():
             if isinstance(v, dict):

src/semiwrap/autowrap/render_cls_prologue.py

@@ -6,7 +6,7 @@ def render_class_prologue(r: RenderBuffer, hctx: HeaderContext):
     # fmt: off
     r.writeln(
         "// This file is autogenerated. DO NOT EDIT\n"
-        "#include <robotpy_build.h>"
+        "#include <semiwrap.h>"
     )
     # fmt: on
 
@@ -36,6 +36,6 @@ def render_class_prologue(r: RenderBuffer, hctx: HeaderContext):
     for cls in hctx.classes_with_trampolines:
         r.writeln()
         r.writeln(
-            f"#define RPYGEN_ENABLE_{cls.full_cpp_name_identifier}_PROTECTED_CONSTRUCTORS"
+            f"#define SWGEN_ENABLE_{cls.full_cpp_name_identifier}_PROTECTED_CONSTRUCTORS"
         )
-        r.writeln(f"#include <rpygen/{cls.full_cpp_name_identifier}.hpp>")
+        r.writeln(f"#include <trampolines/{cls.full_cpp_name_identifier}.hpp>")