Update

Author: borchero

.github/workflows/build.yml

@@ -17,42 +17,13 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up pixi
-<<<<<<< before updating
         uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
         with:
           environments: build
       - name: Set version
         run: pixi run -e build set-version
-||||||| last update
-        uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
-        with:
-          environments: build
-=======
-        uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
-      - name: Derive version
-        id: version
-        if: startsWith(github.ref, 'refs/tags/')
-        shell: bash
-        run: echo "version=$(git describe --tags --abbrev=0 | sed 's/^v//')" >> $GITHUB_OUTPUT
-      - name: Replace version
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-          sed -i -e "s/0.0.0/${STEPS_VERSION_OUTPUTS_VERSION}/g" pyproject.toml
-        env:
-          STEPS_VERSION_OUTPUTS_VERSION: ${{ steps.version.outputs.version }}
->>>>>>> after updating
       - name: Build project
-<<<<<<< before updating
         run: pixi run -e build build-sdist
-||||||| last update
-        run: pixi run -e build build-wheel
-      - name: Check package
-        run: pixi run check-wheel
-=======
-        run: pixi run build-wheel
-      - name: Check package
-        run: pixi run check-wheel
->>>>>>> after updating
       - name: Upload package
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
@@ -105,7 +76,7 @@ jobs:
           printf '@cargo auditable %%*\n' > "C:/cargo-auditable-wrapper.cmd"
           echo "CARGO=C:\\cargo-auditable-wrapper.cmd" >> "$GITHUB_ENV"
       - name: Build wheel
-        uses: PyO3/maturin-action@e83996d129638aa358a18fbd1dfb82f0b0fb5d3b # v1.51.0
+        uses: PyO3/maturin-action@e83996d129638aa358a18fbd1dfb82f0b0fb5d3b # v1.51.0 # zizmor: ignore[cache-poisoning]
         with:
           command: build
           args: --out dist --release -i python3.10
@@ -117,7 +88,7 @@ jobs:
           before-script-linux: |
             ${{ case(github.event_name == 'release', 'cargo install cargo-auditable@0.7.4 --locked && printf ''#!/bin/sh\nexec cargo auditable "$@"\n'' > /usr/local/bin/cargo-auditable-wrapper && chmod +x /usr/local/bin/cargo-auditable-wrapper', '') }}
       - name: Check package
-        run: pixi run check-wheel
+        run: pixi run -e build check-wheel
       - name: Upload package
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:

.github/workflows/chore-pr.yml .github/workflows/chore.yml.github/workflows/chore-pr.yml renamed to .github/workflows/chore.yml

@@ -1,6 +1,6 @@
 name: Chore
 on:
-  pull_request_target:
+  pull_request_target: # zizmor: ignore[dangerous-triggers]
     branches: [main]
     types: [opened, reopened, edited, synchronize]
 

.github/workflows/ci.yml

@@ -13,53 +13,28 @@ permissions:
   contents: read
 
 jobs:
-<<<<<<< before updating
-  pre-commit-checks:
-    name: Pre-commit Checks
-||||||| last update
-  pre-commit:
-=======
   lint:
     name: Lint
->>>>>>> after updating
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:
       - name: Checkout branch
-<<<<<<< before updating
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           # needed for 'pre-commit-mirrors-insert-license'
           fetch-depth: 0
-||||||| last update
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-=======
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
->>>>>>> after updating
       - name: Set up pixi
-<<<<<<< before updating
         uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
         with:
           environments: default lint polars-minimal
       - name: Install Rust
         run: rustup show
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
-      - name: pre-commit
-        run: pixi run pre-commit-run --color=always --show-diff-on-failure
-||||||| last update
-        uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
-        with:
-          environments: default lint
-      - name: pre-commit
-        run: pixi run pre-commit-run --color=always --show-diff-on-failure
-=======
-        uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
       - name: Run linting
         run: pixi run lint
         env:
           CLICOLOR_FORCE: 1
->>>>>>> after updating
 
   unit-tests:
     name: Unit Tests (${{ contains(matrix.os, 'ubuntu') && 'Linux' || (contains(matrix.os, 'windows') && 'Windows' || 'macOS') }}) - ${{ matrix.environment }}
@@ -68,7 +43,6 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-<<<<<<< before updating
         os: [ubuntu-latest, windows-latest, macos-latest]
         environment: [py310, py311, py312, py313, py314]
         with_optionals: [false]
@@ -87,46 +61,13 @@ jobs:
           - os: ubuntu-latest
             environment: polars-minimal
             with_optionals: false
-||||||| last update
-        environment:
-          - py310
-          - py311
-          - py312
-          - py313
-        os:
-          - ubuntu-latest
-          - macos-latest
-          - windows-latest
-=======
-        environment:
-          - py310
-          - py311
-          - py312
-          - py313
-          - py314
-        os:
-          - ubuntu-latest
-          - macos-latest
-          - windows-latest
->>>>>>> after updating
     steps:
       - name: Checkout branch
-<<<<<<< before updating
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-||||||| last update
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 0
-=======
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          fetch-depth: 0
->>>>>>> after updating
       - name: Set up pixi
         uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
         with:
           environments: ${{ matrix.environment }}
-<<<<<<< before updating
           # FIXME: Remove when `s3_server` fixture does not start a process anymore
           post-cleanup: ${{ matrix.os != 'windows-latest' }}
       - name: Install Rust
@@ -135,11 +76,6 @@ jobs:
         uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
       - name: Install repository
         run: pixi run -e ${{ matrix.environment }} postinstall
-||||||| last update
-      - name: Install repository
-        run: pixi run -e ${{ matrix.environment }} postinstall
-=======
->>>>>>> after updating
       - name: Run pytest
         run: pixi run -e ${{ matrix.environment }} test-coverage --color=yes ${{ matrix.with_optionals && '-m with_optionals' || '-m "not with_optionals"'}} --cov=dataframely --cov-report=xml
       - name: Upload codecov

.github/workflows/chore-main.yml .github/workflows/release-drafter.yml.github/workflows/chore-main.yml renamed to .github/workflows/release-drafter.yml

@@ -1,4 +1,4 @@
-name: Chore
+name: Release Drafter
 on:
   push:
     branches: [main]

.github/workflows/scorecard.yml

@@ -74,12 +74,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-<<<<<<< before updating
-        uses: github/codeql-action/upload-sarif@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
-||||||| last update
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
-=======
         uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
->>>>>>> after updating
         with:
           sarif_file: results.sarif

.lefthook.yaml

@@ -28,6 +28,12 @@ pre-commit:
           - name: taplo
             glob: "*.toml"
             run: pixi {run} taplo format {staged_files}
+          - name: cargo-fmt
+            glob: "*.rs"
+            run: pixi {run} cargo fmt
+          - name: cargo-clippy
+            glob: "*.rs"
+            run: pixi {run} cargo clippy --all-targets
           - name: trailing-whitespace-fixer
             glob: "*"
             file_types: text