Merge branch 'main' into em-more

jeertmans · Dec 13, 2024 · 3d1961b · 3d1961b
2 parents 27ebd56 + e3889fb
commit 3d1961b
Show file tree

Hide file tree

Showing 11 changed files with 204 additions and 93 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -22,22 +22,36 @@ permissions:
 
 jobs:
   linux:
-    name: Build Linux-${{ matrix.target}} wheels for differt-core
-    runs-on: ubuntu-latest
+    name: Build linux-${{ matrix.platform.target}} wheels for differt-core
+    runs-on: ${{ matrix.platform.runner }}
     strategy:
       matrix:
-        target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
+        platform:
+        - runner: ubuntu-22.04
+          target: x86_64
+        - runner: ubuntu-22.04
+          target: x86
+        - runner: ubuntu-22.04
+          target: aarch64
+        - runner: ubuntu-22.04
+          target: armv7
+        - runner: ubuntu-22.04
+          target: s390x
+        - runner: ubuntu-22.04
+          target: ppc64le
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
 
     - name: Install Python
       uses: actions/setup-python@v5
+      with:
+        python-version: 3.x
 
     - name: Build wheels
       uses: PyO3/maturin-action@v1
       with:
-        target: ${{ matrix.target }}
+        target: ${{ matrix.platform.target }}
         args: --release --out dist --find-interpreter
         sccache: 'true'
         manylinux: auto
@@ -46,60 +60,111 @@ jobs:
     - name: Upload wheels
       uses: actions/upload-artifact@v4
       with:
-        name: core-wheels-linux-${{ matrix.target }}
+        name: differt-core-wheels-linux-${{ matrix.platform.target }}
+        path: differt-core/dist
+
+  musllinux:
+    name: Build musl-${{ matrix.platform.target}} wheels for differt-core
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      matrix:
+        platform:
+        - runner: ubuntu-22.04
+          target: x86_64
+        - runner: ubuntu-22.04
+          target: x86
+        - runner: ubuntu-22.04
+          target: aarch64
+        - runner: ubuntu-22.04
+          target: armv7
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Install Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.x
+
+    - name: Build wheels
+      uses: PyO3/maturin-action@v1
+      with:
+        target: ${{ matrix.platform.target }}
+        args: --release --out dist --find-interpreter
+        sccache: 'true'
+        manylinux: musllinux_1_2
+        working-directory: differt-core
+
+    - name: Upload wheels
+      uses: actions/upload-artifact@v4
+      with:
+        name: differt-core-wheels-musllinux-${{ matrix.platform.target }}
         path: differt-core/dist
 
   windows:
-    name: Build Windows-${{ matrix.target}} wheels for differt-core
-    runs-on: windows-latest
+    name: Build windows-${{ matrix.platform.target}} wheels for differt-core
+    runs-on: ${{ matrix.platform.runner }}
     strategy:
       matrix:
-        target: [x64, x86]
+        platform:
+        - runner: windows-latest
+          target: x64
+        - runner: windows-latest
+          target: x86
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
 
     - name: Install Python
       uses: actions/setup-python@v5
       with:
-        architecture: ${{ matrix.target }}
+        python-version: 3.x
 
     - name: Build wheels
       uses: PyO3/maturin-action@v1
       with:
-        target: ${{ matrix.target }}
+        target: ${{ matrix.platform.target }}
         args: --release --out dist --find-interpreter
         sccache: 'true'
         working-directory: differt-core
 
     - name: Upload wheels
       uses: actions/upload-artifact@v4
       with:
-        name: core-wheels-windows-${{ matrix.target }}
+        name: differt-core-wheels-windows-${{ matrix.platform.target }}
         path: differt-core/dist
 
   macos:
-    name: Build macOS-${{ matrix.target }} wheels for differt-core
-    runs-on: macos-latest
+    name: Build macos-${{ matrix.platform.target}} wheels for differt-core
+    runs-on: ${{ matrix.platform.runner }}
     strategy:
       matrix:
-        target: [x86_64, aarch64]
+        platform:
+        - runner: macos-13
+          target: x86_64
+        - runner: macos-14
+          target: aarch64
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    - name: Install Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.x
+
     - name: Build wheels
       uses: PyO3/maturin-action@v1
       with:
-        target: ${{ matrix.target }}
+        target: ${{ matrix.platform.target }}
         args: --release --out dist --find-interpreter
         sccache: 'true'
         working-directory: differt-core
 
     - name: Upload wheels
       uses: actions/upload-artifact@v4
       with:
-        name: core-wheels-macos-${{ matrix.target }}
+        name: differt-core-wheels-macos-${{ matrix.platform.target }}
         path: differt-core/dist
 
   sdist:
@@ -119,40 +184,45 @@ jobs:
     - name: Upload sdist
       uses: actions/upload-artifact@v4
       with:
-        name: core-wheels-sdist
+        name: differt-core-wheels-sdist
         path: differt-core/dist
 
-  release-core:
+  release-differt-core:
+    if: (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) || github.event.inputs.publish-differt-core
     name: Release differt-core
     runs-on: ubuntu-latest
-    if: (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) || github.event.inputs.publish-differt-core
-    needs: [linux, windows, macos, sdist]
+    needs: [linux, musllinux, windows, macos, sdist]
     environment: release
     permissions:
       id-token: write
+      contents: write
+      attestations: write
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
 
     - name: Download build wheels
       uses: actions/download-artifact@v4
       with:
-        path: differt-core
-        pattern: core-wheels-*
+        path: differt-core/dist
+        pattern: differt-core-wheels-*
+
+    - name: Generate artifact attestation
+      uses: actions/attest-build-provenance@v1
+      with:
+        subject-path: differt-core/dist/differt-core-wheels-*
 
     - name: Publish to PyPI
       uses: PyO3/maturin-action@v1
       with:
         command: upload
-        args: --non-interactive --skip-existing core-wheels-*/*
+        args: --non-interactive --skip-existing dist/differt-core-wheels-*/*
         working-directory: differt-core
 
-  build-and-release:
-    name: Build and release differt
+  build-differt:
+    name: Build DiffeRT
     runs-on: ubuntu-latest
     environment: release
-    permissions:
-      id-token: write
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -162,18 +232,49 @@ jobs:
       with:
         enable-cache: true
 
-    - name: Install dependencies
-      run: uv sync
-
     - name: Build package
-      run: uv build --package differt -o dist
+      run: uv build --package differt -o differt/dist
 
     - name: Upload sdist
       uses: actions/upload-artifact@v4
       with:
-        name: differt-wheels-and-sdist
-        path: dist
+        name: differt-wheels-sdist
+        path: differt/dist/differt-*.tar.gz
+
+    - name: Upload wheels any
+      uses: actions/upload-artifact@v4
+      with:
+        name: differt-wheels-any
+        path: differt/dist/differt-*.whl
+
+  release-differt:
+    if: (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) || github.event.inputs.publish-differt
+    name: Release DiffeRT
+    runs-on: ubuntu-latest
+    needs: [build-differt]
+    environment: release
+    permissions:
+      id-token: write
+      contents: write
+      attestations: write
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Download build wheels
+      uses: actions/download-artifact@v4
+      with:
+        path: differt/dist
+        pattern: differt-wheels-*
+        merge-multiple: true
+
+    - name: Generate artifact attestation
+      uses: actions/attest-build-provenance@v1
+      with:
+        subject-path: differt/dist/*
 
     - name: Publish to PyPI
-      if: (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) || github.event.inputs.publish-differt
       uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        packages-dir: differt/dist/
+        skip-existing: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -47,7 +47,7 @@ jobs:
       run: uv run --python ${{ matrix.pyversion }} --frozen --no-dev --extra tests-extended pytest
 
     - name: Upload to codecov.io
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       with:
         token: ${{ secrets.DIFFERT_CODECOV_TOKEN }}
         fail_ci_if_error: true
@@ -100,7 +100,7 @@ jobs:
       run: cargo tarpaulin --verbose --timeout 120 --out xml
 
     - name: Upload to codecov.io
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       with:
         token: ${{ secrets.DIFFERT_CODECOV_TOKEN }}
         fail_ci_if_error: true

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,15 +16,15 @@ repos:
     args: [--autofix, --trailing-commas]
     exclude: Cargo.lock
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.8.1
+  rev: v0.8.2
   hooks:
   - id: ruff
     args: [--fix]
     types_or: [python, pyi, jupyter]
   - id: ruff-format
     types_or: [python, pyi, jupyter]
 - repo: https://github.com/RobertCraigie/pyright-python
-  rev: v1.1.389
+  rev: v1.1.390
   hooks:
   - id: pyright
 - repo: https://github.com/doublify/pre-commit-rust

diff --git a/CITATION.cff b/CITATION.cff
@@ -22,4 +22,4 @@ keywords:
   - Radio Propagation
   - Modeling
 license: MIT
-version: v0.0.27
+version: v0.0.29