Migrate tests to semiwrap and add enhancements

- Builds multiple projects that use things from each other

Author: virtuald

tests/cpp/.gitignore

@@ -1,35 +1,18 @@
 
 *.py[ciod]
 
+*.pc
+*.pybind11.json
 *.so
 *.dll
 *.pyd
 *.dylib
 py.typed
 
 
-/build
-/dist
-/pip-wheel-metadata
+build
+dist
+trampolines
 
-# autogenerated from template
-/pyproject.toml
+version.py
 
-/rpytest/version.py
-
-/rpytest/dl/_init_rpytest_dl.py
-/rpytest/dl/pkgcfg.py
-/rpytest/dl/include
-/rpytest/dl/rpy-include
-
-/rpytest/ft/_init_rpytest_ft.py
-/rpytest/ft/pkgcfg.py
-/rpytest/ft/rpy-include
-
-/rpytest/srconly/_init_rpytest_srconly.py
-/rpytest/srconly/pkgcfg.py
-/rpytest/srconly/include
-/rpytest/srconly/rpy-include
-
-/rpytest/tc/_init_rpytest_tc.py
-/rpytest/tc/pkgcfg.py

tests/cpp/dl/downloaded.cpp

@@ -1,94 +1,49 @@
 #!/usr/bin/env python3
 
-import http.server
 import os
 from os.path import abspath, dirname, join
 import pathlib
 import shutil
 import sys
 import subprocess
-import threading
 import tempfile
 import zipfile
 
 
-def create_artifact_path(path, group_id, artifact_id, version, classifier):
-    components = group_id.split(".") + [artifact_id, version]
-    path = join(path, *components)
-    os.makedirs(path, exist_ok=True)
-    fname = f"{artifact_id}-{version}-{classifier}.zip"
-    return join(path, fname)
-
-
-def http_server():
-    httpd = http.server.HTTPServer(
-        ("127.0.0.1", 0), http.server.SimpleHTTPRequestHandler
-    )
-
-    t = threading.Thread(target=httpd.serve_forever, daemon=True)
-    t.start()
-
-    return httpd, httpd.socket.getsockname()[1]
+def subprocess_must_run(*args, **kwargs):
+    """Run a subprocess verbosely and exit if there is an error"""
+    try:
+        print("+", *args[0])
+        subprocess.run(check=True, *args, **kwargs)
+    except subprocess.CalledProcessError as cbe:
+        print(cbe, file=sys.stderr)
+        sys.exit(cbe.returncode)
 
 
 if __name__ == "__main__":
     root = abspath(dirname(__file__))
     os.chdir(root)
 
-    # delete build/cache directory
-    shutil.rmtree(join(root, "build", "cache"), ignore_errors=True)
-
-    # create tempdir with maven directory structure for pkg
-    with tempfile.TemporaryDirectory() as d:
-        # create headers and sources zip files
-        hname = create_artifact_path(d, "fake.dl", "dl", "1.2.3", "headers")
-        with zipfile.ZipFile(hname, "w") as z:
-            z.write(join(root, "dl", "downloaded.h"), "downloaded.h")
-
-        sname = create_artifact_path(d, "fake.dl", "dl", "1.2.3", "sources")
-        with zipfile.ZipFile(sname, "w") as z:
-            z.write(join(root, "dl", "downloaded.cpp"), "downloaded.cpp")
-
-        # http.server prior to 3.7 could only serve the current directory
-        os.chdir(d)
+    to_install = ["sw-test-base", "sw-caster-consumer", "sw-test"]
 
-        # start http server on random port
-        httpd, port = http_server()
-
-        with open(join(root, "pyproject.toml.tmpl")) as rfp:
-            content = rfp.read().replace("RANDOM_PORT", str(port))
-            with open(join(root, "pyproject.toml"), "w") as wfp:
-                wfp.write(content)
-
-        cwd = None
+    # First, uninstall packages
+    subprocess_must_run(
+        [sys.executable, "-m", "pip", "--disable-pip-version-check", "uninstall", "-y"]
+        + to_install
+    )
 
-        if len(sys.argv) == 2 and sys.argv[1] == "wheel":
-            cmd_args = [sys.executable, "-m", "build", "--wheel", "--no-isolation"]
-            cwd = root
-        elif len(sys.argv) == 2 and sys.argv[1] == "develop":
-            cmd_args = [sys.executable, "setup.py", "develop", "-N"]
-            cwd = root
-        else:
-            # run pip install
-            cmd_args = [
+    # Now install them
+    for pkg in to_install:
+        subprocess_must_run(
+            [
                 sys.executable,
                 "-m",
                 "pip",
                 "-v",
                 "--disable-pip-version-check",
                 "install",
                 "--no-build-isolation",
+                os.path.abspath(pkg),
             ]
-
-            if len(sys.argv) == 2 and sys.argv[1] == "-e":
-                cmd_args.append("-e")
-
-            cmd_args.append(root)
-
-        env = os.environ.copy()
-        env["SETUPTOOLS_SCM_PRETEND_VERSION"] = "0.0.1"
-
-        subprocess.check_call(cmd_args, cwd=cwd, env=env)
-
-        # Windows fails if you try to delete the directory you're currently in
-        os.chdir(root)
+            + sys.argv[1:]
+        )

tests/cpp/dl/downloaded.h

@@ -0,0 +1,11 @@
+project('sw-caster-consumer', ['cpp'],
+        default_options: ['warning_level=1', 'cpp_std=c++20',
+                          'b_colorout=auto', 'optimization=2', 'b_pie=true'])
+
+subdir('wrapcfg')
+
+sw_caster_consumer__module_sources += files(
+  'src/sw_caster_consumer/cpp/main.cpp',
+)
+
+subdir('wrapcfg/modules')

tests/cpp/gen/dl/downloaded.yml

@@ -0,0 +1,29 @@
+[build-system]
+build-backend = "hatchling.build"
+requires = ["semiwrap", "hatch-meson", "hatchling"]
+
+[project]
+description = "Test program"
+name = "sw-caster-consumer"
+version = "0.0.1"
+
+[tool.hatch.build.targets.wheel]
+packages = ['src/sw_caster_consumer']
+
+[tool.hatch.build.hooks.semiwrap]
+
+[tool.hatch.build.hooks.meson]
+
+#
+# Semiwrap configuration
+#
+
+[tool.semiwrap]
+[tool.semiwrap.extension_modules."sw_caster_consumer._module"]
+depends = ["swtest_base__module"]
+
+[tool.semiwrap.extension_modules."sw_caster_consumer._module".headers]
+more = "cpp/more.h"
+
+# checks that caster is included automatically when in a namespace
+ns_more = "cpp/ns_more.h"

tests/cpp/rpytest/dl/__init__.py

@@ -0,0 +1 @@
+from ._module import add_more_to_inty

tests/cpp/rpytest/dl/dl.cpp

@@ -0,0 +1,5 @@
+#include <semiwrap_init.sw_caster_consumer._module.hpp>
+
+SEMIWRAP_PYBIND11_MODULE(m) {
+    initWrapper(m);
+}

tests/cpp/rpytest/dl/dl.patch

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <inty.h>
+
+inline inty add_more_to_inty(inty v, long value) {
+    v.long_value += value;
+    return v;
+}

tests/cpp/rpytest/ft/src/ft.cpp

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <ns_inty.h>
+
+namespace ns {
+
+inline inty2 add_more_to_inty2(inty2 v, long value) {
+    v.long_value += value;
+    return v;
+}
+
+}

tests/cpp/rpytest/ft/subpkg.py

@@ -0,0 +1 @@
+/meson.build

tests/cpp/rpytest/srconly/__init__.py

@@ -0,0 +1 @@
+/meson.build

tests/cpp/rpytest/srconly/srconly.cpp

@@ -0,0 +1,4 @@
+---
+
+functions:
+  add_more_to_inty:

tests/cpp/run_install.py

@@ -0,0 +1,4 @@
+---
+
+functions:
+  add_more_to_inty2:

tests/cpp/setup.py

@@ -0,0 +1 @@
+/meson.build

tests/cpp/sw-caster-consumer/meson.build

@@ -0,0 +1,3 @@
+/src/swtest_base/sw-caster-test-casters.pc
+/src/swtest_base/sw-caster-test-casters.pybind11.json
+/src/swtest_base/trampolines

tests/cpp/sw-caster-consumer/pyproject.toml

@@ -0,0 +1,19 @@
+project('swtest-base', ['cpp'],
+        default_options: ['warning_level=1', 'cpp_std=c++20',
+                          'b_colorout=auto', 'optimization=2', 'b_pie=true'])
+
+subdir('wrapcfg')
+
+swtest_base__module_sources += files(
+  'src/swtest_base/cpp/main.cpp',
+)
+
+swtest_base__module2_sources += files(
+  'src/swtest_base/cpp/main2.cpp',
+)
+
+swtest_base__module3_sources += files(
+  'src/swtest_base/cpp/main3.cpp',
+)
+
+subdir('wrapcfg/modules')