Rewrite of cbsdk

.github/workflows/build_cbsdk.yml

@@ -9,6 +9,7 @@ on:
   pull_request:
     branches:
       - master
+      - dev
   release:
     types: [published]
 
@@ -27,36 +28,22 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {name: "windows-x64", os: "windows-latest", cmake_extra: "-T v142,host=x86", arch: "AMD64"}
-          - {name: "windows-arm64", os: "windows-latest", cmake_extra: "-A ARM64", arch: "ARM64"}
-          - {name: "macOS-latest", os: "macOS-latest", arch: "auto"}
-          - {name: "jammy", os: "ubuntu-22.04", arch: "x86_64"}
-          - {name: "ubuntu-latest", os: "ubuntu-latest", arch: "x86_64"}
-          - {name: "bookworm-x64", os: "ubuntu-latest", container: "debian:bookworm", arch: "x86_64"}
-          - {name: "linux-arm64", os: "ubuntu-latest", arch: "aarch64"}
-
-    container: ${{ matrix.config.container }}
+          - {name: "windows-x64", os: "windows-latest", cmake_extra: "", arch: "AMD64"}
+          - {name: "macOS-latest", os: "macOS-latest", cmake_extra: "", arch: "auto"}
+          - {name: "linux-x64", os: "ubuntu-latest", cmake_extra: "", arch: "x86_64"}
+          - {name: "linux-arm64", os: "ubuntu-latest", cmake_extra: "", arch: "aarch64"}
 
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up QEMU for ARM emulation
         if: matrix.config.arch == 'aarch64'
         uses: docker/setup-qemu-action@v3
         with:
           platforms: arm64
 
-      - name: Install build dependencies (Debian container)
-        if: matrix.config.container
-        run: |
-          apt-get update
-          apt-get install -y \
-            cmake g++ make git \
-            python3 python3-pip python3-venv \
-            file lsb-release dpkg-dev
-
       - name: Install ARM64 cross-compilation tools
         if: matrix.config.arch == 'aarch64'
         run: |
@@ -87,11 +74,8 @@ jobs:
             SHLIBDEPS_ARG="-DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=OFF"
           fi
           cmake -B build -S . \
-          -DCBSDK_BUILD_CBMEX=OFF \
-          -DCBSDK_BUILD_CBOCT=OFF \
           -DCBSDK_BUILD_TEST=OFF \
           -DCBSDK_BUILD_SAMPLE=OFF \
-          -DCBSDK_BUILD_TOOLS=OFF \
           -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_INSTALL_PREFIX=${PWD}/install \
           -DCPACK_PACKAGE_DIRECTORY=${PWD}/dist \
@@ -107,66 +91,15 @@ jobs:
             cmake --build build --target package --config Release -j
           fi
 
-      - name: Set up Python
-        if: "!matrix.config.container"
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.13'
-
-      - name: Install cibuildwheel
-        if: "!matrix.config.container"
-        run: python -m pip install cibuildwheel
-
-      - name: Build wheels
-        if: "(!startsWith(matrix.config.os, 'ubuntu-') || matrix.config.os == 'ubuntu-latest' || matrix.config.name == 'linux-arm64') && !matrix.config.container"
-        run: python -m cibuildwheel bindings/Python --output-dir bindings/Python/dist
-        env:
-          CIBW_BUILD: cp311-* cp312-* cp313-*
-          CIBW_SKIP: "*-musllinux_* *-win32 *-manylinux_i686"
-          CIBW_BUILD_VERBOSITY: 1
-          CIBW_ENVIRONMENT: CBSDK_INSTALL_PATH="${{ github.workspace }}/install" PIP_ONLY_BINARY=":all:"
-          CIBW_ARCHS: ${{ matrix.config.arch }}
-
-      - name: Linux - Prefix package with release name
-        if: startswith(matrix.config.os, 'ubuntu-') && !matrix.config.container && matrix.config.arch != 'aarch64'
-        run: |
-          pushd dist
-          temp="$(lsb_release -cs)"
-          for name in *
-          do
-            mv "$name" "$(echo $temp)-$name"
-          done
-          popd
-
-      - name: Debian - Prefix package with release name
-        if: matrix.config.container
-        run: |
-          pushd dist
-          for name in *
-          do
-            mv "$name" "bookworm-$name"
-          done
-          popd
-
       - name: Upload C++ Packages
         uses: actions/upload-artifact@v4
         with:
           name: cpp-packages-${{ matrix.config.name }}
           path: dist/*
           if-no-files-found: ignore
 
-      - name: Upload Python Wheels
-        uses: actions/upload-artifact@v4
-        if: "(!startsWith(matrix.config.os, 'ubuntu-') || matrix.config.os == 'ubuntu-latest' || matrix.config.name == 'linux-arm64') && !matrix.config.container"
-        with:
-          name: python-wheels-${{ matrix.config.name }}
-          path: bindings/Python/dist/*.whl
-          if-no-files-found: ignore
-
       - name: Attach to Release
         uses: softprops/action-gh-release@v1
         if: github.event_name == 'release'
         with:
-          files: |
-            dist/*
-            bindings/Python/dist/*.whl
+          files: dist/*

.github/workflows/build_pycbsdk.yml

@@ -0,0 +1,151 @@
+name: Build pycbsdk Wheels
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [master]
+    paths:
+      - 'src/**'
+      - 'pycbsdk/**'
+      - '.github/workflows/build_pycbsdk.yml'
+  pull_request:
+    branches:
+      - master
+      - dev
+    paths:
+      - 'src/**'
+      - 'pycbsdk/**'
+  release:
+    types: [ published ]
+
+permissions:
+  contents: read
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build-wheel:
+    name: ${{ matrix.config.name }}
+    runs-on: ${{ matrix.config.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - name: windows-x64
+            os: windows-latest
+            cmake_extra: ""
+            lib_pattern: "cbsdk.dll"
+          - name: linux-x64
+            os: ubuntu-latest
+            cmake_extra: ""
+            lib_pattern: "libcbsdk.so"
+          - name: macos-universal
+            os: macos-latest
+            cmake_extra: ""
+            lib_pattern: "libcbsdk.dylib"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0  # Full history needed for git describe and setuptools-scm
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+
+      - name: Install Python build tools
+        run: pip install build setuptools wheel setuptools-scm
+
+      - name: Build cbsdk shared library
+        run: |
+          cmake -B build -S . \
+            -DCBSDK_BUILD_SHARED=ON \
+            -DCBSDK_BUILD_TEST=OFF \
+            -DCBSDK_BUILD_SAMPLE=OFF \
+            -DCMAKE_BUILD_TYPE=Release \
+            ${{ matrix.config.cmake_extra }}
+          cmake --build build --target cbsdk_shared --config Release
+
+      - name: Copy shared library to package
+        run: |
+          find build -name "${{ matrix.config.lib_pattern }}" -type f | head -1 | while read f; do
+            echo "Found: $f"
+            cp "$f" pycbsdk/src/pycbsdk/
+          done
+          ls -la pycbsdk/src/pycbsdk/
+
+      - name: Build wheel
+        run: |
+          cd pycbsdk
+          python -m build --wheel
+
+      - name: Repair wheel (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          pip install auditwheel patchelf
+          # Detect the compatible manylinux tag for this toolchain
+          PLAT=$(auditwheel show pycbsdk/dist/*.whl 2>&1 | grep -oP 'manylinux_\d+_\d+_x86_64' | head -1)
+          if [ -z "$PLAT" ]; then
+            echo "auditwheel could not determine a manylinux tag, tagging as linux_x86_64"
+            PLAT="linux_x86_64"
+          fi
+          echo "Repairing wheel for platform: $PLAT"
+          auditwheel repair pycbsdk/dist/*.whl -w pycbsdk/wheelhouse/ --plat "$PLAT"
+          rm pycbsdk/dist/*.whl
+          mv pycbsdk/wheelhouse/*.whl pycbsdk/dist/
+
+      - name: Repair wheel (macOS)
+        if: runner.os == 'macOS'
+        run: |
+          pip install delocate
+          delocate-wheel -v pycbsdk/dist/*.whl
+
+      - name: Upload wheel
+        uses: actions/upload-artifact@v4
+        with:
+          name: pycbsdk-${{ matrix.config.name }}
+          path: pycbsdk/dist/*.whl
+
+  build-sdist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release'
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+      - run: pip install build setuptools-scm
+      - run: cd pycbsdk && python -m build --sdist
+      - uses: actions/upload-artifact@v4
+        with:
+          name: pycbsdk-sdist
+          path: pycbsdk/dist/*.tar.gz
+
+  publish:
+    name: Publish to PyPI
+    needs: [build-wheel, build-sdist]
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release'
+    permissions:
+      id-token: write   # Required for trusted publishing (OIDC)
+    environment:
+      name: pypi
+      url: https://pypi.org/p/pycbsdk
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: dist/
+          merge-multiple: true
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: dist/

.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: Configure CBSDK
         run: |
@@ -46,4 +46,6 @@ jobs:
         run: cmake --build build --config Release -j
 
       - name: Run Tests
-        run: ctest --test-dir build --build-config Release --output-on-failure
+        run: >
+          ctest --test-dir build --build-config Release --output-on-failure
+          -E "^device\."

.gitignore

@@ -48,5 +48,9 @@ Release/
 **/cerelink/cbpyw.cpp
 **/cerelink/*.dll
 **/cerelink/__version__.py
+*.ccf
+!tests/ccf_raw.ccf
+!tests/ccf_spk_1k.ccf
 
-upstream
+upstream
+*/uv.lock