Fix pyi and some other things too

Author: virtuald

pyproject.toml

@@ -31,7 +31,6 @@ dependencies = [
     "typing-extensions",
     "validobj",
     "pyyaml >= 5.1",
-    "patch == 1.*",
     "pybind11-stubgen ~= 2.5.1",
     "delocate; platform_system == 'Darwin'",
     "distro; platform_system == 'Linux'",

src/semiwrap/autowrap/cxxparser.py

@@ -90,16 +90,20 @@
 
 
 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
@@ -1998,7 +2002,7 @@ def parse_header(
         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=header_path.relative_to(header_root, walk_up=True).as_posix(),
     )
 
     # Parse the header using a custom visitor

src/semiwrap/autowrap/generator_data.py

@@ -12,9 +12,12 @@
 
 from cxxheaderparser.types import Function
 
+from validobj.validation import parse_input
+
 import dataclasses
+import enum
 import pathlib
-from typing import Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 
 @dataclasses.dataclass

src/semiwrap/cmd_gen_pkgconf.py

@@ -6,7 +6,7 @@
 import inspect
 import pathlib
 
-from .pkgconf_cache import INITPY_VARNAME
+from .mkpc import make_pc_file
 from .pyproject import PyProject
 
 
@@ -26,39 +26,17 @@ def main():
     depends = project.get_extension_deps(module)
 
     pc_install_path = project.package_root / pathlib.Path(*package_name.split("."))
-
-    pc_content = [
-        "# automatically generated by semiwrap",
-        "prefix=${pcfiledir}",
-    ]
-
-    if args.libinit_py:
-        pc_content.append(f"{INITPY_VARNAME}={args.libinit_py}")
-
-    cflags = ["-I${prefix}"]
-
-    for i, inc in enumerate(module.includes):
-        includedir = project.root / pathlib.PurePosixPath(inc)
-        rel = includedir.relative_to(pc_install_path.parent)
-        pc_content.append(f"inc{i}=${{prefix}}/{rel.as_posix()}")
-        cflags.append(f"-I${{inc{i}}}")
-
-    pc_content += [
-        "",
-        f"Name: {package_name}",
-        f"Description: semiwrap pybind11 module",
-        "Version:",  # TODO put in correct version
-        "Cflags: " + " ".join(cflags),
-    ]
-
-    if depends:
-        requires = " ".join(depends)
-        pc_content.append(f"Requires: {requires}")
-
-    pc_content.append("")
-
-    with open(args.pcfile, "w") as fp:
-        fp.write("\n".join(pc_content))
+    make_pc_file(
+        project_root=project.root,
+        pcfile=args.pcfile,
+        pc_install_path=pc_install_path,
+        name=args.name,
+        desc="semiwrap pybind11 module",
+        version="",
+        includes=module.includes,
+        depends=depends,
+        libinit_py=args.libinit_py,
+    )
 
 
 if __name__ == "__main__":

src/semiwrap/cmd_header2dat.py

@@ -89,8 +89,8 @@ def generate_wrapper(
 
     gendata.report_missing(src_yml, missing_reporter)
 
-    if not report_only and missing_reporter:
-        print("WARNING: some items not in generation yaml for", src_h)
+    if not report_only and missing_reporter and not data.defaults.ignore:
+        print("WARNING: some items not in", src_yml, "for", src_h)
         for name, contents in missing_reporter.as_yaml():
             print(contents)
 

src/semiwrap/cmd_make_pyi.py

@@ -40,6 +40,8 @@ def _write_pyi(package_name, generated_pyi: T.Dict[pathlib.PurePath, pathlib.Pat
     # to a temporary directory and then we copy the files from there to
     # our desired location
     with tempfile.TemporaryDirectory() as tmpdir:
+        tmpdir_pth = pathlib.Path(tmpdir)
+
         # Call pybind11-stubgen
         sys.argv = [
             "<dummy>",
@@ -51,11 +53,19 @@ def _write_pyi(package_name, generated_pyi: T.Dict[pathlib.PurePath, pathlib.Pat
             package_name,
         ]
 
+        os.system(f"find {tmpdir_pth}")
+
+        # Create the parent directories in the temporary directory
+        for infile in generated_pyi.keys():
+            (tmpdir_pth / infile).parent.mkdir(parents=True, exist_ok=True)
+
         pybind11_stubgen.main()
 
+        print("=" * 80, file=sys.stderr)
+        os.system(f"find {tmpdir_pth}")
+
         # stubgen doesn't take a direct output filename, so move the file
         # to our desired location
-        tmpdir_pth = pathlib.Path(tmpdir)
         for infile, output in generated_pyi.items():
             output.unlink(missing_ok=True)
             shutil.move(tmpdir_pth / infile, output)
@@ -103,6 +113,12 @@ def main():
                 )
             pkg = ppkg
 
+    import pprint
+
+    pprint.pprint(package_map, sys.stderr)
+    pprint.pprint(generated_pyi, sys.stderr)
+    print("*" * 80, file=sys.stderr)
+
     sys.meta_path.insert(0, _PackageFinder)
 
     _write_pyi(package_name, generated_pyi)

src/semiwrap/cmd_publish_casters.py

@@ -9,6 +9,7 @@
 import sys
 
 from .casters import TypeCasterJsonData, TypeCasterJsonHeader, save_typecaster_json_data
+from .mkpc import make_pc_file
 from .pyproject import PyProject
 
 
@@ -22,40 +23,31 @@ def main():
     project = PyProject(pathlib.Path(pyproject_toml))
     cfg = project.project.export_type_casters[caster_name]
 
-    # determine the include directory location relative to the pc directory
-    # .. needs to be the pc install directory, not the output file
-    includedir = project.root / pathlib.Path(cfg.includedir)
-    if not includedir.exists():
-        print(f"ERROR: {includedir} does not exist", file=sys.stderr)
-        print(
-            f"- specified at [tool.semiwrap.export_type_casters.{caster_name}].includedir",
-            file=sys.stderr,
-        )
-        sys.exit(1)
+    # make sure the include directories actually exist
+    include_dirs = []
+    for inc in cfg.includedir:
+        includedir = project.root / pathlib.Path(inc)
+        include_dirs.append(includedir)
+        if not includedir.exists():
+            print(f"ERROR: {includedir} does not exist", file=sys.stderr)
+            print(
+                f"- specified at [tool.semiwrap.export_type_casters.{caster_name}].includedir",
+                file=sys.stderr,
+            )
+            sys.exit(1)
 
     pc_install_path = project.package_root / pathlib.Path(*cfg.pypackage.split("."))
-    rel_includedir = includedir.relative_to(pc_install_path)
-
-    # Write the pc file
-    pc_content = [
-        "# automatically generated by semiwrap",
-        "prefix=${pcfiledir}",
-        f"includedir=${{prefix}}/{rel_includedir.as_posix()}",
-        "",
-        f"Name: {caster_name}",
-        "Description: pybind11 type casters",
-        "Version:",  # TODO put in correct version
-        "Cflags: -I${includedir}",
-    ]
-
-    if cfg.requires:
-        requires = " ".join(cfg.requires)
-        pc_content.append(f"Requires: {requires}")
-
-    pc_content.append("")
-
-    with open(output_pc, "w") as fp:
-        fp.write("\n".join(pc_content))
+    make_pc_file(
+        project_root=project.root,
+        pcfile=pathlib.Path(output_pc),
+        pc_install_path=pc_install_path,
+        name=caster_name,
+        desc="pybind11 type casters",
+        version="",
+        includes=cfg.includedir,
+        depends=cfg.requires,
+        libinit_py=None,
+    )
 
     #
     # Gather the data and write it next to the pc file
@@ -65,13 +57,22 @@ def main():
     for hdr in cfg.headers:
 
         # Ensure the published header actually exists
-        full_hdr = includedir / hdr.header
-        if not full_hdr.exists():
-            print(f"ERROR: {full_hdr} does not exist", file=sys.stderr)
+        searched = []
+        for inc in include_dirs:
+            full_hdr = inc / hdr.header
+            if full_hdr.exists():
+                break
+
+            searched.append(full_hdr)
+        else:
+
+            print(f"ERROR: {hdr.header} does not exist", file=sys.stderr)
             print(
                 f"- specified at [[tool.semiwrap.export_type_casters.{caster_name}.headers]].header",
                 file=sys.stderr,
             )
+            for s in searched:
+                print(f"- searched '{s}'")
             sys.exit(1)
 
         data.headers.append(

src/semiwrap/config/pyproject_toml.py

@@ -38,6 +38,7 @@ class TypeCasterConfig:
 
        [tool.semiwrap.export_type_casters.NAME]
        pypackage = "mypkg"
+       includedirs = ["src/mypkg/type-casters"]
 
        [[tool.semiwrap.export_type_casters.NAME.headers]]
        header = "my_type_caster.h"
@@ -50,7 +51,7 @@ class TypeCasterConfig:
     pypackage: str
 
     #: Location of type caster header files, relative to the root of the project
-    includedir: str
+    includedir: List[str]
 
     #: pkgconf 'requires'
     requires: List[str] = dataclasses.field(default_factory=list)

src/semiwrap/makeplan.py

@@ -6,6 +6,7 @@
 import pathlib
 import pprint
 import sys
+import sysconfig
 import typing as T
 
 from .casters import PKGCONF_CASTER_EXT
@@ -192,7 +193,7 @@ def _process_export_type_caster(self, name: str, caster_cfg: TypeCasterConfig):
 
         dep = self.pkgcache.add_local(
             name=name,
-            includes=[self.project_root / caster_cfg.includedir],
+            includes=[self.project_root / inc for inc in caster_cfg.includedir],
             requires=caster_cfg.requires,
         )
         caster_dep = LocalDependency(
@@ -218,7 +219,7 @@ def _process_extension_module(
 
         # Detect the location of the package in the source tree
         package_init_py = self.pyproject.package_root / package_path / "__init__.py"
-        self.pyi_args += (parent_package, package_init_py.as_posix())
+        self.pyi_args += [parent_package, package_init_py.as_posix()]
 
         depends = self.pyproject.get_extension_deps(extension)
         depends.append("semiwrap")
@@ -260,7 +261,9 @@ def _process_extension_module(
                 install_path=package_path,
             )
 
-            self.pyi_args += [libinit_py, libinit_tgt]
+            libinit_module = f"{parent_package}.{libinit_py}"[:-3]
+            self.pyi_args += [libinit_module, libinit_tgt]
+
             yield libinit_tgt
 
         #
@@ -454,6 +457,12 @@ def _process_headers(
             for inc in include_directories_uniq:
                 header2dat_args += ["-I", inc]
 
+            # https://github.com/pkgconf/pkgconf/issues/391
+            header2dat_args += ["-I", sysconfig.get_path("include")]
+
+            # TODO
+            header2dat_args += ["-D", "__cplusplus 201703L"]
+
             header2dat_args.append(yml)
             header2dat_args.append(yml_input)
             header2dat_args.append(h_input)
@@ -544,7 +553,7 @@ def _locate_header(self, hdr: str, search_path: T.List[pathlib.Path]):
         for p in search_path:
             h_path = p / phdr
             if h_path.exists():
-                return InputFile(h_path.relative_to(self.project_root)), p
+                return InputFile(h_path.relative_to(self.project_root, walk_up=True)), p
         raise FileNotFoundError(
             f"cannot locate {phdr} in {', '.join(map(str, search_path))}"
         )

src/semiwrap/mkpc.py

@@ -0,0 +1,50 @@
+import pathlib
+import typing as T
+
+from .pkgconf_cache import INITPY_VARNAME
+
+
+def make_pc_file(
+    project_root: pathlib.Path,
+    pcfile: pathlib.Path,
+    pc_install_path: pathlib.Path,
+    name: str,
+    desc: str,
+    version: str,
+    includes: T.List[str],
+    depends: T.List[str],
+    libinit_py: T.Optional[str],
+):
+
+    pc_content = [
+        "# automatically generated by semiwrap",
+        "prefix=${pcfiledir}",
+    ]
+
+    if libinit_py:
+        pc_content.append(f"{INITPY_VARNAME}={libinit_py}")
+
+    cflags = ["-I${prefix}"]
+
+    for i, inc in enumerate(includes):
+        includedir = project_root / pathlib.PurePosixPath(inc)
+        rel = includedir.relative_to(pc_install_path.parent)
+        pc_content.append(f"inc{i}=${{prefix}}/{rel.as_posix()}")
+        cflags.append(f"-I${{inc{i}}}")
+
+    pc_content += [
+        "",
+        f"Name: {name}",
+        f"Description: {desc}",
+        f"Version: {version}",
+        "Cflags: " + " ".join(cflags),
+    ]
+
+    if depends:
+        requires = " ".join(depends)
+        pc_content.append(f"Requires: {requires}")
+
+    pc_content.append("")
+
+    with open(pcfile, "w") as fp:
+        fp.write("\n".join(pc_content))