Dev

.github/workflows/build-qgis-plugin.yml

@@ -0,0 +1,87 @@
+name: Build QGIS Plugin
+
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version for the release"
+        required: true
+        default: "0.1.0"
+
+jobs:
+  build-plugin:
+    name: Build QGIS Plugin
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Get version
+        id: version
+        run: |
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            echo "version=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
+          else
+            # Extract version from tag (e.g., v0.1.0 -> 0.1.0)
+            echo "version=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Build plugin package
+        run: python qgis_plugin/build_plugin.py --version ${{ steps.version.outputs.version }}
+
+      - name: Validate plugin ZIP
+        run: |
+          cd qgis_plugin
+          ZIP=$(ls solweig-qgis-*.zip | head -1)
+          echo "Validating $ZIP..."
+          unzip -l "$ZIP" | tee /tmp/bundle_contents.txt
+
+          # Check essential files exist
+          for file in metadata.txt __init__.py provider.py icon.png; do
+            if grep -q "solweig_qgis/$file" /tmp/bundle_contents.txt; then
+              echo "  OK: $file found"
+            else
+              echo "  MISSING: $file"
+              exit 1
+            fi
+          done
+
+          echo "Plugin validation passed."
+
+      - name: Upload plugin package
+        uses: actions/upload-artifact@v4
+        with:
+          name: qgis-plugin
+          path: qgis_plugin/solweig-qgis-*.zip
+
+  create-release:
+    name: Create Release
+    needs: build-plugin
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+    permissions:
+      contents: write
+
+    steps:
+      - name: Download plugin
+        uses: actions/download-artifact@v4
+        with:
+          name: qgis-plugin
+          path: artifacts/
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            artifacts/*.zip
+          generate_release_notes: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docs.yml

@@ -0,0 +1,55 @@
+name: Deploy Documentation
+
+on:
+  push:
+    branches: [main]
+    tags-ignore:
+      - "**"
+    paths:
+      - 'docs/**'
+      - 'mkdocs.yml'
+      - 'pysrc/**'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Install dependencies
+        run: |
+          pip install mkdocs-material mkdocstrings[python] pymdown-extensions
+
+      - name: Build documentation
+        run: mkdocs build --strict
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: site/
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/python-publish.yml

@@ -2,25 +2,15 @@ name: publish package
 on:
   push:
     tags-ignore:
-      - "*.*.*[a]*"
+      - "*.*.*[a]*" # Skip alpha tags (e.g. v0.1.0a1); beta/rc/release tags publish to PyPI
 permissions:
   contents: read
 jobs:
-  check:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Install uv
-        uses: astral-sh/setup-uv@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        run: uv python install ${{ matrix.python-version }}
+  test:
+    uses: ./.github/workflows/test.yml
   linux:
     runs-on: ${{ matrix.platform.runner }}
-    needs: check
+    needs: test
     strategy:
       matrix:
         platform:
@@ -47,7 +37,7 @@ jobs:
           path: dist
   musllinux:
     runs-on: ${{ matrix.platform.runner }}
-    needs: check
+    needs: test
     strategy:
       matrix:
         platform:
@@ -74,7 +64,7 @@ jobs:
           path: dist
   windows:
     runs-on: ${{ matrix.platform.runner }}
-    needs: check
+    needs: test
     strategy:
       matrix:
         platform:
@@ -99,13 +89,13 @@ jobs:
           path: dist
   macos:
     runs-on: ${{ matrix.platform.runner }}
-    needs: check
+    needs: test
     strategy:
       matrix:
         platform:
-          - runner: macos-13
+          - runner: macos-15-intel # Intel x86_64 (GitHub's recommended replacement)
             target: x86_64
-          - runner: macos-14
+          - runner: macos-14 # Apple Silicon ARM64
             target: aarch64
     steps:
       - uses: actions/checkout@v4
@@ -125,7 +115,7 @@ jobs:
           path: dist
   sdist:
     runs-on: ubuntu-latest
-    needs: check
+    needs: test
     steps:
       - uses: actions/checkout@v4
       - name: Build sdist
@@ -156,9 +146,16 @@ jobs:
         uses: actions/attest-build-provenance@v2
         with:
           subject-path: "wheels-*/*"
+      - name: Merge wheels into dist/
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        run: mkdir -p dist && cp wheels-*/* dist/
       - name: Publish to PyPI
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
-        uses: PyO3/maturin-action@v1
+        uses: pypa/gh-action-pypi-publish@release/v1
+      - name: Create GitHub Release
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        uses: softprops/action-gh-release@v2
         with:
-          command: upload
-          args: --non-interactive --skip-existing wheels-*/*
+          files: dist/*
+          generate_release_notes: true
+          prerelease: ${{ contains(github.ref, 'a') || contains(github.ref, 'b') || contains(github.ref, 'rc') }}

.github/workflows/test.yml

@@ -0,0 +1,157 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+    tags-ignore:
+      - "**"
+  pull_request:
+    branches:
+      - main
+      - dev
+  workflow_call: # Allow publish workflow to call this as a dependency
+
+# Cancel in-progress runs for the same branch/PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Set up Python
+        run: uv python install 3.12
+
+      - name: Install dependencies
+        run: uv sync --group dev
+
+      - name: Run ruff check
+        run: uv run ruff check
+
+      - name: Run ruff format check
+        run: uv run ruff format --check
+
+  typecheck:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Set up Python
+        run: uv python install 3.12
+
+      - name: Install dependencies
+        run: uv sync --group dev
+
+      - name: Run ty
+        run: uv run ty check pysrc/ tests/ demos/ scripts/ qgis_plugin/
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11", "3.12"]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Set up Python ${{ matrix.python-version }}
+        run: uv python install ${{ matrix.python-version }}
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install dependencies
+        run: uv sync --group dev
+
+      - name: Build Rust extension
+        run: uv run maturin develop --release
+
+      - name: Run tests (excluding slow)
+        run: uv run python -m pytest tests/ -m 'not slow' -v --tb=short
+        env:
+          PYTHONPATH: ${{ github.workspace }}
+
+  memory-benchmark:
+    name: Memory benchmark
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Set up Python 3.12
+        run: uv python install 3.12
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install dependencies
+        run: uv sync --group dev
+
+      - name: Build Rust extension
+        run: uv run maturin develop --release
+
+      - name: Run memory benchmark tests
+        run: uv run python -m pytest tests/benchmarks/ -v --tb=short
+        env:
+          PYTHONPATH: ${{ github.workspace }}
+
+  test-qgis-compat:
+    name: Test QGIS compatibility (NumPy 1.26)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Set up Python 3.12
+        run: uv python install 3.12
+
+      - name: Install GDAL system libraries
+        run: sudo apt-get update && sudo apt-get install -y libgdal-dev gdal-bin python3-gdal
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install dependencies (QGIS compat - NumPy 1.26)
+        run: uv sync --group qgis-compat
+
+      - name: Install GDAL Python bindings matching system
+        run: uv pip install "gdal==$(gdal-config --version)"
+
+      - name: Build Rust extension
+        run: uv run maturin develop --release
+
+      - name: Verify NumPy version
+        run: uv run python -c "import numpy; assert numpy.__version__.startswith('1.26'), f'Expected NumPy 1.26.x, got {numpy.__version__}'"
+
+      - name: Verify GDAL backend is used
+        run: uv run python -c "from solweig import io; assert io.GDAL_ENV, 'Expected GDAL backend'"
+        env:
+          UMEP_USE_GDAL: "1"
+
+      - name: Run tests (excluding slow) with GDAL backend
+        run: uv run python -m pytest tests/ -m 'not slow' -v --tb=short
+        env:
+          PYTHONPATH: ${{ github.workspace }}
+          UMEP_USE_GDAL: "1"