Temporary commit

Author: virtuald

.github/workflows/dist.yml

@@ -42,22 +42,22 @@ jobs:
     - uses: actions/checkout@v3
     - uses: pre-commit/[email protected]
 
-  check-doc:
-    runs-on: ubuntu-22.04
+  # check-doc:
+  #   runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: true
 
-    - uses: actions/setup-python@v4
-      with:
-        python-version: 3.8
-    - name: Sphinx
-      run: |
-        pip --disable-pip-version-check install -e .
-        pip --disable-pip-version-check install -r docs/requirements.txt
-        cd docs && make clean html SPHINXOPTS="-W --keep-going"
+  #   - uses: actions/setup-python@v5
+  #     with:
+  #       python-version: 3.8
+  #   - name: Sphinx
+  #     run: |
+  #       pip --disable-pip-version-check install -e .
+  #       pip --disable-pip-version-check install -r docs/requirements.txt
+  #       cd docs && make clean html SPHINXOPTS="-W --keep-going"
 
   build:
     runs-on: ubuntu-22.04
@@ -67,7 +67,7 @@ jobs:
         submodules: recursive
         fetch-depth: 0
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: 3.8
 
@@ -97,12 +97,12 @@ jobs:
         - '3.11'
         - '3.12'
         - '3.13'
-        architecture: [x86, x64]
-        exclude:
-        - os: macos-13
-          architecture: x86
-        - os: ubuntu-22.04
-          architecture: x86
+        architecture: [x64]
+        # exclude:
+        # - os: macos-13
+        #   architecture: x86
+        # - os: ubuntu-22.04
+        #   architecture: x86
         include:
         - os: macos-14
           python_version: 3.9
@@ -116,7 +116,7 @@ jobs:
       with:
         submodules: true
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python_version }}
         architecture: ${{ matrix.architecture }}
@@ -133,25 +133,32 @@ jobs:
           key: ${{ matrix.os }}-${{ matrix.architecture }}-${{ matrix.python_version }}
           variant: ccache
 
+    - name: Setup MSVC
+      uses: bus1/cabuild/action/msdevshell@e22aba57d6e74891d059d66501b6b5aed8123c4d  # v1
+      with:
+        architecture: x64
+      if: runner.os == 'Windows'
+
+    - name: Configure ccache for MSVC
+      shell: bash
+      # https://github.com/mesonbuild/meson/issues/10423
+      run: |
+        echo "CC=ccache.exe cl" >> $GITHUB_ENV
+        echo "CXX=ccache.exe cl" >> $GITHUB_ENV
+      if: runner.os == 'Windows'
+
     - name: Install
       shell: bash
       working-directory: dist
       run: python -m pip --disable-pip-version-check install *.whl
 
     - name: Install test dependencies
-      shell: bash
       working-directory: tests
       run: python -m pip --disable-pip-version-check install -r requirements.txt
 
     - name: Test wheel
-      shell: bash
-      env:
-        RPYBUILD_PARALLEL: 1
-        RPYBUILD_STRIP_LIBPYTHON: 1
-        RPYBUILD_CC_LAUNCHER: ccache
       working-directory: tests
-      run: |
-        python run_tests.py
+      run: python run_tests.py
 
   cross-build:
     runs-on: ubuntu-latest
@@ -160,9 +167,8 @@ jobs:
       max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
       matrix:
         container:
-        - wpilib/roborio-cross-ubuntu:2024-22.04-py312
-        - wpilib/raspbian-cross-ubuntu:bullseye-22.04-py312
-        - wpilib/aarch64-cross-ubuntu:bullseye-22.04-py312
+        - wpilib/roborio-cross-ubuntu:2025-22.04-py313
+        - wpilib/raspbian-cross-ubuntu:2025-bookworm-22.04-py313
 
     container:
       image: "${{ matrix.container }}"
@@ -184,33 +190,23 @@ jobs:
         name: dist
         path: dist
 
-    - name: Install setuptools
-      run: |
-        /build/venv/bin/build-pip --disable-pip-version-check install setuptools
-        /build/venv/bin/cross-pip --disable-pip-version-check install setuptools
+    - name: Setup cross environment
+      uses: robotpy/build-actions/setup-cross-meson@semiwrap
 
     - name: Install
       working-directory: dist
       run: |
-        # install to both cross and build in case things get mixed up
         /build/venv/bin/build-pip --disable-pip-version-check install *.whl
-        /build/venv/bin/cross-pip --disable-pip-version-check install *.whl
 
     - name: Install test dependencies
       shell: bash
       working-directory: tests
       run: |
-        # install to both cross and build in case things get mixed up
         /build/venv/bin/build-pip --disable-pip-version-check install -r requirements.txt
-        /build/venv/bin/cross-pip --disable-pip-version-check install -r requirements.txt
 
     - name: Build cross wheel
-      env:
-        RPYBUILD_PARALLEL: 1
-        RPYBUILD_STRIP_LIBPYTHON: 1
-        RPYBUILD_CC_LAUNCHER: ccache
       working-directory: tests/cpp
-      run: /build/venv/bin/cross-python run_install.py wheel
+      run: /build/venv/bin/cross-python run_install.py --config-settings=setup-args=--cross-file=cross.txt
 
   publish:
     runs-on: ubuntu-latest

examples/demo/gen/.gitkeep

@@ -0,0 +1,23 @@
+project('demo', ['cpp'],
+        default_options: ['warning_level=1', 'cpp_std=c++20',
+                          'b_colorout=auto', 'optimization=2', 'b_pie=true'])
+
+# Include autogenerated wrapcfg/meson.build
+subdir('wrapcfg')
+
+# Add additional source files to predefined variable in wrapcfg/meson.build
+demo_sources += files(
+  'swdemo/src/demo.cpp',
+  'swdemo/src/main.cpp',
+)
+
+# You can add extra compilation arguments by adding a dependency to predefined
+# variable
+demo_deps += [
+  declare_dependency(include_directories: ['swdemo/include'])
+]
+
+# Include autogenerated wrapcfg/modules/meson.build
+# - Builds the extension modules
+# - Generates the pyi file for the extension modules
+subdir('wrapcfg/modules')

examples/demo/meson.build

@@ -1,41 +1,38 @@
 
-# This section tells pip to install robotpy-build before starting a build
+# This section tells pip to install semiwrap before starting a build
 [build-system]
-requires = ["robotpy-build"]
-
-# Tells robotpy-build where to place autogenerated metadata
-[tool.robotpy-build]
-base_package = "rpydemo"
-
-# This section configures the 'rpydemo' python package. Multiple
-# sections are possible to build multiple packages
-[tool.robotpy-build.wrappers."rpydemo"]
-name = "rpydemo"
-
-# C++ source files to compile, path is relative to the root of the project
-sources = [
-    "rpydemo/src/demo.cpp",
-    "rpydemo/src/main.cpp"
-]
-
-# This is a directory that can be used to customize the autogenerated
-# C++ code
-# -> autogenerate those files via `robotpy-build create-gen`
-generation_data = "gen"
-
-# This tells robotpy-build to parse include/demo.h and autogenerate pybind11
-# wrappers for the contents of the header.
-# -> autogenerate this via `robotpy-build scan-headers`
-[tool.robotpy-build.wrappers."rpydemo".autogen_headers]
-demo = "demo.h"
-
-
-# Standard python package metadata
-[tool.robotpy-build.metadata]
-name = "robotpy-build-demo"
-description = "robotpy-build demo program"
-author = "RobotPy Development Team"
-author_email = "[email protected]"
-url = "https://github.com/robotpy/robotpy-build"
-license = "BSD-3-Clause"
-install_requires = []
+build-backend = "hatchling.build"
+requires = ["semiwrap", "hatch-meson", "hatchling"]
+
+[project]
+name = "swdemo"
+description = "Demo program"
+version = "0.0.1"
+
+#
+# hatch-semiwrap configuration
+# .. this generates meson.build to perform autogen
+#
+
+[tool.hatch.build.hooks.semiwrap]
+# autogen_build_path = "autogen"
+
+#
+# hatch-meson configuration
+# .. this executes meson to build python extension modules
+#
+
+[tool.hatch.build.hooks.meson]
+
+
+#
+# semiwrap code generation configuration
+#
+
+[tool.semiwrap]
+
+[tool.semiwrap.extension_modules."swdemo._demo"]
+name = "demo"
+
+[tool.semiwrap.extension_modules."swdemo._demo".headers]
+demo = "include/demo.h"

examples/demo/pyproject.toml

@@ -1,4 +1,4 @@
 # autogenerated by 'robotpy-build create-imports rpydemo rpydemo._rpydemo'
-from ._rpydemo import DemoClass, add2
+from ._demo import DemoClass, add2
 
 __all__ = ["DemoClass", "add2"]

examples/demo/rpydemo/src/main.cpp

@@ -4,6 +4,8 @@
 /** Adds 2 to the first parameter and returns it */
 int add2(int x);
 
+namespace demo {
+
 /**
     Doxygen documentation is automatically added to your python objects
     when the bindings are autogenerated.
@@ -20,3 +22,5 @@ class DemoClass {
 private:
     int m_x = 0;
 };
+
+} // namespace demo

examples/demo/setup.py

@@ -5,10 +5,14 @@ int add2(int x) {
     return x + 2;
 }
 
+namespace demo {
+
 void DemoClass::setX(int x) {
     m_x = x;
 }
 
 int DemoClass::getX() const {
     return m_x;
-}
+}
+
+} // namespace demo

examples/demo/rpydemo/__init__.py renamed to examples/demo/swdemo/__init__.py

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

examples/demo/rpydemo/include/demo.h renamed to examples/demo/swdemo/include/demo.h

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

examples/demo/rpydemo/src/demo.cpp renamed to examples/demo/swdemo/src/demo.cpp

@@ -3,7 +3,7 @@
 functions:
   add2:
 classes:
-  DemoClass:
+  demo::DemoClass:
     methods:
       setX:
       getX:

examples/demo/swdemo/src/main.cpp

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

examples/demo/wrapcfg/.gitignore

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

examples/demo/gen/demo.yml renamed to examples/demo/wrapcfg/demo.yml

@@ -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"
 
@@ -50,7 +51,7 @@ semiwrap = "semiwrap.tool: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"]