Merge branch 'main' into 1_to_1_allocation_networks

.github/workflows/core_testmodels.yml

@@ -33,7 +33,7 @@ jobs:
         with:
           cache-compiled: "true"
           cache-registries: "true"
-      - uses: prefix-dev/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi

.github/workflows/core_tests.yml

@@ -33,7 +33,7 @@ jobs:
         with:
           cache-compiled: "true"
           cache-registries: "true"
-      - uses: prefix-dev/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi

.github/workflows/docs.yml

@@ -24,7 +24,7 @@ jobs:
         with:
           cache-compiled: "true"
           cache-registries: "true"
-      - uses: prefix-dev/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi

.github/workflows/julia_auto_update.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-      - uses: prefix-dev/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Update Julia manifest file

.github/workflows/mypy.yml

@@ -16,7 +16,7 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi

.github/workflows/pixi_auto_update.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-      - uses: prefix-dev/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
           cache: false

.github/workflows/python_codegen.yml

@@ -16,7 +16,7 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi

.github/workflows/python_tests.yml

@@ -26,7 +26,7 @@ jobs:
           - py310
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi

.github/workflows/qgis.yml

@@ -22,7 +22,7 @@ jobs:
           - windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.5.2
+      - uses: prefix-dev/setup-pixi@v0.6.0
         with:
           pixi-version: "latest"
       - name: Prepare pixi

pixi.toml

@@ -53,8 +53,18 @@ initialize-julia = { depends_on = [
 # Docs
 build-julia-docs = { cmd = "julia --project docs/make.jl", depends_on = [
     "initialize-julia",
+], inputs = [
+    "core",
+    "docs/make.jl",
+], outputs = [
+    "docs/build",
+] }
+quartodoc-build = { cmd = "quartodoc build && rm objects.json", cwd="docs", inputs = [
+    "docs/_quarto.yml",
+    "python/ribasim",
+], outputs = [
+    "docs/python/reference",
 ] }
-quartodoc-build = { cmd = "quartodoc build && rm objects.json", cwd = "docs" }
 quarto-preview = { cmd = "quarto preview docs", depends_on = [
     "quartodoc-build",
     "generate-testmodels",
@@ -99,11 +109,20 @@ test-ribasim-core = { cmd = "julia --project=core --eval 'using Pkg; Pkg.test()'
 test-ribasim-core-cov = { cmd = "julia --project=core --eval 'using Pkg; Pkg.test(coverage=true, julia_args=[\"--check-bounds=yes\"])'", depends_on = [
     "generate-testmodels",
 ] }
-generate-testmodels = "python utils/generate-testmodels.py"
+generate-testmodels = { cmd = "python utils/generate-testmodels.py", inputs = [
+    "python/ribasim",
+    "python/ribasim_testmodels",
+], outputs = [
+    "generated_testmodels",
+] }
 tests = { depends_on = ["lint", "test-ribasim-python", "test-ribasim-core"] }
 # Codegen
 codegen = { cmd = "julia --project utils/gen_python.jl && ruff format python/ribasim/ribasim/schemas.py", depends_on = [
     "initialize-julia",
+], inputs = [
+    "core",
+], outputs = [
+    "python/ribasim/ribasim/schemas.py",
 ] }
 # Publish
 build-ribasim-python-wheel = { cmd = "rm --recursive --force dist && python -m build && twine check dist/*", cwd = "python/ribasim" }