Merge branch 'main' into feature/drop-numpy-1-support

Author: jaapschoutenalliander

.github/workflows/build-test-release.yml

@@ -31,33 +31,37 @@ jobs:
     steps:
 
       - name: Checkout source code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
-      - name: Setup Python 3.13
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        if: ${{ always() }}
         with:
-          python-version: "3.13"
+            activate-environment: true
+            enable-cache: true
+    
+      - name: Install dependencies
+        if: ${{ always() }}
+        run: uv sync --frozen
 
       - name: Set PyPI version
         uses: PowerGridModel/pgm-version-bump@main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build
-        run: |
-          cat PYPI_VERSION
-          pip install build
-          python -m build --outdir wheelhouse .
-
       - name: Save version
         id: version
         run: echo "version=$(cat PYPI_VERSION)" >> $GITHUB_OUTPUT
 
+      - name: Build
+        run: |
+          uv build
+        
       - name: Store built wheel file
         uses: actions/upload-artifact@v4
         with:
           name: power-grid-model-ds
-          path: wheelhouse/
+          path: dist/
 
   tests:
     needs: build-python
@@ -70,26 +74,32 @@ jobs:
 
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
-      - name: Setup Python ${{ matrix.python }}
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        if: ${{ always() }}
         with:
-          python-version: ${{ matrix.python }}
+          activate-environment: true
+          enable-cache: true
+
+      - name: install poe
+        run: uv tool install poethepoet
 
       - name: Load built wheel file
         uses: actions/download-artifact@v4
         with:
           name: power-grid-model-ds
-          path: wheelhouse/
+          path: dist/
 
       - name: Install built wheel file
-        run: pip install power-grid-model-ds[dev]==${{ needs.build-python.outputs.version }} --find-links=wheelhouse
+        run: uv pip install power-grid-model-ds[dev]==${{ needs.build-python.outputs.version }} --find-links=dist
 
-      - name: Unit test and coverage
-        run: pytest --verbose
+      - name: Run All Code Quality Checks & Tests
+        run: poe all --check
 
   github-release:
+    if: ${{ github.ref == 'refs/heads/main' && inputs.create_release }}
     needs:
       - build-python
       - tests
@@ -99,22 +109,16 @@ jobs:
     outputs:
       tag: ${{ steps.tag.outputs.tag }}
     steps:
-      - name: Setup Python 3.13
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-
       - name: Checkout source code
-        uses: actions/checkout@v4  # needed by 'Prevent automatic major/minor release'
+        uses: actions/checkout@v5
 
       - name: Load built wheel file
         uses: actions/download-artifact@v4
         with:
           name: power-grid-model-ds
-          path: wheelhouse/
+          path: dist/
 
       - name: Prevent automatic major/minor release
-        if: (github.event_name == 'push')
         run: |
           echo "Fetching the latest release..."
           tag=$(gh release view --json tagName --jq '.tagName')
@@ -139,12 +143,44 @@ jobs:
         run: echo "${{ steps.tag.outputs.tag }}"
 
       - name: Release
-        if: (inputs.create_release)
         uses: softprops/action-gh-release@v2
         with:
           files: |
-            ./wheelhouse/*
+            ./dist/*
           tag_name: ${{ steps.tag.outputs.tag }}
-          prerelease: ${{github.ref != 'refs/heads/main'}}
           generate_release_notes: true
           target_commitish: ${{ github.sha }}
+
+  publish:
+    name: Publish to PyPI
+    needs: github-release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write  # Required for Trusted Publishing
+    steps:
+      - name: Download assets from latest GitHub release using gh CLI
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          mkdir -p assets-to-publish
+          release_tag="${{ needs.build-test-release.outputs.tag }}"
+          gh release download "$release_tag" --repo "$GITHUB_REPOSITORY" --dir assets-to-publish
+
+      - name: List downloaded assets
+        run: ls -la assets-to-publish
+
+      - name: Upload assets to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          # To test, use the TestPyPI:
+          # repository-url: https://test.pypi.org/legacy/
+          # You must also create an account and project on TestPyPI,
+          # as well as set the trusted-publisher in the project settings:
+          # https://docs.pypi.org/trusted-publishers/adding-a-publisher/
+          # To publish to the official PyPI repository, just keep
+          # repository-url commented out.
+          packages-dir: assets-to-publish
+          skip-existing: true
+          print-hash: true
+          verbose: true

.github/workflows/check-blocking-labels.yml

@@ -6,16 +6,12 @@
 name: Check Blocking Labels
 
 on:
-  # run pipeline on pull request
   pull_request:
     types:
       - opened
       - synchronize
       - labeled
       - unlabeled
-  # run pipeline on merge queue
-  merge_group:
-  # run this workflow manually from the Actions tab
   workflow_dispatch:
 
 concurrency:

.github/workflows/check-code-quality.yml

@@ -8,6 +8,12 @@ name: Check Code Quality
 on:
   # run pipeline from another workflow
   workflow_call:
+    inputs:
+      update_dependencies:
+        type: boolean
+        description: Update dependencies to their latest version
+        default: false
+        required: false
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-code-quality
@@ -16,21 +22,52 @@ concurrency:
 jobs:
   check-code-quality:
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        python-version: ["3.11", "3.12", "3.13"]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - name: Checkout source code
+        uses: actions/checkout@v5
 
-      - name: Set up Python
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        if: ${{ always() }}
         with:
-          python-version: 3.11
+          activate-environment: true
+          enable-cache: true
+          python-version: ${{ matrix.python-version }}
 
-      - name: Upgrade pip
-        run: pip install --upgrade pip
+      - name: install poe
+        if: ${{ always() }}
+        run: uv tool install poethepoet
 
       - name: Install dependencies
-        run: pip install -e .[dev]
-      
-      - name: Run pre-commit on all files
-        run: pre-commit run --all-files
+        if: ${{ always() }}
+        run: uv sync --frozen --dev
+
+      - name: Update dependencies
+        if: ${{ inputs.update_dependencies && always() }}
+        run: uv sync --upgrade --dev
+
+      - name: lint
+        if: ${{ always() }}
+        run: poe lint --check
+      - name: format
+        if: ${{ always() }}
+        run: poe format --check
+      - name: lock
+        if: ${{ always() }}
+        run: poe lock
+      - name: type
+        if: ${{ always() }}
+        run: poe type
+      - name: cover
+        if: ${{ always() }}
+        run: poe cover
+      - name: report
+        if: ${{ always() }}
+        run: poe report
+
+      - name: Actually stop now if any quality control failed
+        if: ${{ failure() }}
+        run: exit 1

.github/workflows/ci.yml

@@ -3,19 +3,18 @@
 # SPDX-License-Identifier: MPL-2.0
 
 
-name: CI Build
+name: CI/CD
 
 on:
   push:
     branches:
       - main  # run pipeline on pull request
   pull_request:
-  merge_group:  # run pipeline on merge queue
   workflow_dispatch:  # run this workflow manually from the Actions tab
     inputs:
       create_release:
         type: boolean
-        description: Create a (pre-)release when CI passes
+        description: Create a release (only works on main branch)
         default: false
         required: true
 
@@ -30,62 +29,17 @@ jobs:
       - run: echo "ci started"
 
   build-test-release:
+    if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
     name: build-test-release
     uses: "./.github/workflows/build-test-release.yml"
     permissions:
       contents: write
+      id-token: write  # Required for Trusted Publishing
     with:
-      create_release: ${{ (github.event_name == 'workflow_dispatch' && inputs.create_release) || (github.event_name == 'push') }}
+      create_release: ${{ inputs.create_release }}
 
   check-code-quality:
     uses: "./.github/workflows/check-code-quality.yml"
 
   reuse-compliance:
     uses: "./.github/workflows/reuse-compliance.yml"
-
-  ci-passed:
-    runs-on: ubuntu-latest
-    needs: [ci-started, build-test-release, check-code-quality, reuse-compliance]
-    if: always()
-
-    steps:
-      # this explicit check is needed cfr. https://github.com/orgs/community/discussions/75568
-      - name: "Check whether all jobs passed"
-        run: echo '${{ toJSON(needs) }}' | jq -e 'to_entries | all(.value.result == "success")'
-      - run: echo "ci passed"
-
-  publish:
-    name: Publish to PyPI
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      id-token: write  # Required for Trusted Publishing
-    needs: build-test-release
-    if: (github.event_name == 'workflow_dispatch' && inputs.create_release) || github.event_name == 'push'
-
-    steps:
-      - name: Download assets from latest GitHub release using gh CLI
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          mkdir -p assets-to-publish
-          release_tag="${{ needs.build-test-release.outputs.tag }}"
-          gh release download "$release_tag" --repo "$GITHUB_REPOSITORY" --dir assets-to-publish
-
-      - name: List downloaded assets
-        run: ls -la assets-to-publish
-
-      - name: Upload assets to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          # To test, use the TestPyPI:
-          # repository-url: https://test.pypi.org/legacy/
-          # You must also create an account and project on TestPyPI,
-          # as well as set the trusted-publisher in the project settings:
-          # https://docs.pypi.org/trusted-publishers/adding-a-publisher/
-          # To publish to the official PyPI repository, just keep
-          # repository-url commented out.
-          packages-dir: assets-to-publish
-          skip-existing: true
-          print-hash: true
-          verbose: true

.github/workflows/citations.yml

@@ -31,8 +31,5 @@ jobs:
     steps:
     - name: checkout
       uses: actions/checkout@v4
-    - name: Install R
-      run: |
-        sudo apt-get update && sudo apt-get install -y r-base
     - name: Validate CITATION.cff
       uses: dieghernan/cff-validator@v4

.github/workflows/dco-merge-group.yml

@@ -15,15 +15,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-test-release:
-    uses: "./.github/workflows/build-test-release.yml"
-    permissions:
-      contents: write
-    with:
-      create_release: false
-
   check-code-quality:
     uses: "./.github/workflows/check-code-quality.yml"
-
-  reuse-compliance:
-    uses: "./.github/workflows/reuse-compliance.yml"
+    with:
+      update_dependencies: true