Merge branch 'main' into check-warn

Deltares · Oct 7, 2024 · 422d45d · 422d45d
2 parents 7396cd7 + e9339b8
commit 422d45d
Show file tree

Hide file tree

Showing 26 changed files with 10,702 additions and 10,667 deletions.
diff --git a/.github/workflows/core_testmodels.yml b/.github/workflows/core_testmodels.yml
@@ -36,7 +36,7 @@ jobs:
  cache-registries: "true"
  - uses: prefix-dev/setup-pixi@v0.8.1
  with:
- pixi-version: "latest"
+ pixi-version: v0.30.0
  - name: Prepare pixi
  run: pixi run install-ci
  - name: Run testmodels with Ribasim Core

diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml
@@ -36,7 +36,7 @@ jobs:
  cache-registries: "true"
  - uses: prefix-dev/setup-pixi@v0.8.1
  with:
- pixi-version: "latest"
+ pixi-version: v0.30.0
  - name: Test Ribasim Core
  run: |
  pixi run test-ribasim-core-cov

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -27,7 +27,7 @@ jobs:
  cache-registries: "true"
  - uses: prefix-dev/setup-pixi@v0.8.1
  with:
- pixi-version: "latest"
+ pixi-version: v0.30.0
  - name: Prepare pixi
  run: pixi run install-ci
 

diff --git a/.github/workflows/julia_auto_update.yml b/.github/workflows/julia_auto_update.yml
@@ -16,7 +16,7 @@ jobs:
  ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
  - uses: prefix-dev/setup-pixi@v0.8.1
  with:
- pixi-version: "latest"
+ pixi-version: v0.30.0
  - name: Update Julia manifest file
  run: |
  pixi run install-julia

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
@@ -19,7 +19,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: prefix-dev/setup-pixi@v0.8.1
  with:
- pixi-version: "latest"
+ pixi-version: v0.30.0
  - name: Run mypy on python/ribasim
  run: |
  pixi run mypy-ribasim-python

diff --git a/.github/workflows/pixi_auto_update.yml b/.github/workflows/pixi_auto_update.yml
@@ -19,6 +19,7 @@ jobs:
  - name: Set up pixi
  uses: prefix-dev/setup-pixi@v0.8.1
  with:
+ pixi-version: v0.30.0
  run-install: false
  - name: Update lockfiles
  run: |
@@ -31,7 +32,7 @@ jobs:
  commit-message: Update pixi lockfile
  title: Update pixi lockfile
  body-path: diff.md
- branch: update-pixi
+ branch: update/pixi-lock
  base: main
  delete-branch: true
  add-paths: pixi.lock
diff --git a/.github/workflows/python_codegen.yml b/.github/workflows/python_codegen.yml
@@ -19,7 +19,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: prefix-dev/setup-pixi@v0.8.1
  with:
- pixi-version: "latest"
+ pixi-version: v0.30.0
  - name: Test if codegen runs without errors
  run: pixi run codegen
  - name: Ensure that no code has been generated

diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml
@@ -29,7 +29,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: prefix-dev/setup-pixi@v0.8.1
  with:
- pixi-version: "latest"
+ pixi-version: v0.30.0
  - name: Test Ribasim Python
  run: pixi run --environment ${{ matrix.pixi-environment }} test-ribasim-python-cov
  - name: Upload coverage to Codecov

diff --git a/.github/workflows/qgis.yml b/.github/workflows/qgis.yml
@@ -19,7 +19,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: prefix-dev/setup-pixi@v0.8.1
  with:
- pixi-version: "latest"
+ pixi-version: v0.30.0
  - name: Run tests
  run: pixi run test-ribasim-qgis-docker
  - name: Upload coverage to Codecov