Simplify build-wheels workflow and improve testing

- Remove duplicate cibuildwheel config, rely on pyproject.toml
- Use CIBW_ENVIRONMENT_PASS_* to override CFD_ROOT for CI
- Remove redundant CFD library build steps (handled by before-build)
- Use pattern: wheels-* for explicit artifact download
- Download wheels and sdist separately for clarity
- Add id-token: write permission for Test PyPI
- Replace smoke tests with full pytest suite

Author: shaia

.github/workflows/build-wheels.yml

@@ -9,7 +9,8 @@ on:
     branches: [main, master]
   release:
     types: [published]
-  # Allow triggering from cfd repo or manually
+  # Allow manual triggering or remote triggering via GitHub CLI/API
+  # (used by cfd repo's version-release.yml via: gh workflow run build-wheels.yml)
   workflow_dispatch:
     inputs:
       cfd_ref:
@@ -44,7 +45,7 @@ jobs:
             # Use the release tag
             echo "ref=${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
             echo "Using CFD library tag: ${{ github.event.release.tag_name }}"
-          elif [[ "${{ github.ref }}" == refs/tags/* ]]; then
+          elif [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
             # Push of a tag
             TAG=${GITHUB_REF#refs/tags/}
             echo "ref=$TAG" >> $GITHUB_OUTPUT
@@ -68,46 +69,18 @@ jobs:
           ref: ${{ steps.cfd-version.outputs.ref }}
           fetch-depth: 0
 
-      # Build CFD C library (static)
-      - name: Build CFD C library (Linux/macOS)
-        if: runner.os != 'Windows'
-        run: |
-          cd cfd
-          cmake -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF
-          cmake --build build --config Release
-
-      - name: Build CFD C library (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          cd cfd
-          cmake -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF
-          cmake --build build --config Release
-
+      # Build wheels using cibuildwheel
+      # Configuration is in pyproject.toml - only override CFD_ROOT for CI
+      # (pyproject.toml uses ../cfd for local dev, CI uses ./cfd)
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.21.3
         env:
-          CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-*
-          CIBW_SKIP: "*-musllinux_* pp*"
-          CIBW_ARCHS_WINDOWS: AMD64
-          CIBW_ARCHS_MACOS: x86_64 arm64
-          CIBW_ARCHS_LINUX: x86_64
-
-          # Environment for static linking and stable ABI
-          # CFD_ROOT points to the cfd subdirectory in the workspace
-          CIBW_ENVIRONMENT: "CMAKE_BUILD_TYPE=Release CFD_STATIC_LINK=ON CFD_USE_STABLE_ABI=ON CFD_ROOT=./cfd"
-
-          # Test the built wheels
-          CIBW_TEST_COMMAND: >
-            python -c "import cfd_python; print('CFD Python version:', cfd_python.__version__); print('Solvers:', cfd_python.list_solvers())"
-
-          # macOS wheel repair (static linking handles most deps)
-          CIBW_REPAIR_WHEEL_COMMAND_MACOS: delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
-
-          # Linux wheel repair
-          CIBW_REPAIR_WHEEL_COMMAND_LINUX: auditwheel repair -w {dest_dir} {wheel}
-
-          # Windows - no repair needed with static linking
-          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: ""
+          # Override CFD_ROOT to point to the cfd subdirectory in CI workspace
+          # All other settings come from pyproject.toml [tool.cibuildwheel]
+          CIBW_ENVIRONMENT_PASS_LINUX: CFD_ROOT
+          CIBW_ENVIRONMENT_PASS_MACOS: CFD_ROOT
+          CIBW_ENVIRONMENT_PASS_WINDOWS: CFD_ROOT
+          CFD_ROOT: ./cfd
 
       - uses: actions/upload-artifact@v4
         with:
@@ -150,30 +123,14 @@ jobs:
           name: wheels-${{ matrix.os }}
           path: wheelhouse
 
-      - name: Install wheel
+      - name: Install wheel and test dependencies
         run: |
           python -m pip install --upgrade pip
           python -m pip install --find-links wheelhouse cfd-python
+          python -m pip install pytest numpy
 
-      - name: Test import and version
-        run: |
-          python -c "import cfd_python; print('Version:', cfd_python.__version__)"
-
-      - name: Test solver discovery
-        run: |
-          python -c "import cfd_python; solvers = cfd_python.list_solvers(); print('Solvers:', solvers); assert len(solvers) > 0"
-
-      - name: Test simulation
-        run: |
-          python -c "import cfd_python; result = cfd_python.run_simulation(5, 5, steps=3); assert len(result) == 25; print('Simulation OK')"
-
-      - name: Test grid creation
-        run: |
-          python -c "import cfd_python; grid = cfd_python.create_grid(5, 5, 0, 1, 0, 1); assert grid['nx'] == 5; print('Grid OK')"
-
-      - name: Test solver params
-        run: |
-          python -c "import cfd_python; params = cfd_python.get_default_solver_params(); assert 'dt' in params; print('Params OK')"
+      - name: Run full test suite
+        run: pytest tests/ -v
 
   upload_pypi:
     name: Upload to PyPI
@@ -193,9 +150,15 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
+          pattern: wheels-*
           path: dist
           merge-multiple: true
 
+      - uses: actions/download-artifact@v4
+        with:
+          name: sdist
+          path: dist
+
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
@@ -205,17 +168,25 @@ jobs:
     name: Upload to Test PyPI
     needs: [build_wheels, build_sdist, test_package]
     runs-on: ubuntu-latest
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')
     environment:
       name: testpypi
       url: https://test.pypi.org/p/cfd-python
+    permissions:
+      id-token: write
 
     steps:
       - uses: actions/download-artifact@v4
         with:
+          pattern: wheels-*
           path: dist
           merge-multiple: true
 
+      - uses: actions/download-artifact@v4
+        with:
+          name: sdist
+          path: dist
+
       - name: Publish to Test PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with: