diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index c6a2b5894..0a765a530 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -37,7 +37,7 @@ jobs: with: pixi-version: "latest" - name: Prepare pixi - run: pixi run install-without-pre-commit + run: pixi run install-ci - name: Test Ribasim Core run: | pixi run test-ribasim-core-cov diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f5c8d72a2..3dbb49563 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -28,7 +28,7 @@ jobs: with: pixi-version: "latest" - name: Prepare pixi - run: pixi run install-without-pre-commit + run: pixi run install-ci - name: Check Quarto installation and all engines run: pixi run quarto-check diff --git a/.github/workflows/python_lint.yml b/.github/workflows/python_lint.yml index cfd3f628a..15bcb778e 100644 --- a/.github/workflows/python_lint.yml +++ b/.github/workflows/python_lint.yml @@ -20,7 +20,7 @@ jobs: with: pixi-version: "latest" - name: Prepare pixi - run: pixi run install-without-pre-commit + run: pixi run install-ci - name: Run mypy on python/ribasim run: | pixi run mypy-ribasim-python diff --git a/.github/workflows/qgis.yml b/.github/workflows/qgis.yml index 0e934ed13..e8f46b333 100644 --- a/.github/workflows/qgis.yml +++ b/.github/workflows/qgis.yml @@ -27,7 +27,7 @@ jobs: pixi-version: "latest" - name: Prepare pixi run: | - pixi run install-without-pre-commit + pixi run install-ci - name: Run tests run: pixi run test-ribasim-qgis-cov - name: Upload coverage to Codecov diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_GenerateTestmodels.xml b/.teamcity/Ribasim/buildTypes/Ribasim_GenerateTestmodels.xml index 0b356de7c..93486df67 100644 --- a/.teamcity/Ribasim/buildTypes/Ribasim_GenerateTestmodels.xml +++ b/.teamcity/Ribasim/buildTypes/Ribasim_GenerateTestmodels.xml @@ -19,7 +19,7 @@ source /usr/share/Modules/init/bash module load pixi pixi --version -pixi run install-without-pre-commit]]> +pixi run install-ci]]> diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml index f0595b117..646583b20 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml @@ -19,7 +19,7 @@ source /usr/share/Modules/init/bash module load pixi pixi --version -pixi run install-without-pre-commit]]> +pixi run install-ci]]> diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml index 68b1c7c42..b5f19d98f 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml @@ -18,7 +18,7 @@ source /usr/share/Modules/init/bash module load pixi pixi --version -pixi run install-without-pre-commit]]> +pixi run install-ci]]> diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml index e3f2982d9..9a3c252da 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml @@ -19,7 +19,7 @@ source /usr/share/Modules/init/bash module load pixi pixi --version -pixi run install-without-pre-commit]]> +pixi run install-ci]]> diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml index 6ea08f763..c376f147d 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml @@ -19,7 +19,7 @@ source /usr/share/Modules/init/bash module load pixi pixi --version -pixi run install-without-pre-commit]]> +pixi run install-ci]]> diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml index 3cc1a12c8..06a31dcbe 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml @@ -14,7 +14,7 @@ +pixi run install-ci]]> diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml index 031915d93..a731216c4 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml @@ -12,7 +12,7 @@ - + diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml index a10c6af45..820192d09 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml @@ -13,7 +13,7 @@ - + diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml index ccd2e426f..9c9484b66 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml @@ -13,7 +13,7 @@ - + diff --git a/pixi.toml b/pixi.toml index c6b092ce6..ef2e49b15 100644 --- a/pixi.toml +++ b/pixi.toml @@ -19,14 +19,18 @@ install-ribasim-python = "pip install --no-deps --editable python/ribasim" install-ribasim-api = "pip install --no-deps --editable python/ribasim_api" install-ribasim-testmodels = "pip install --no-deps --editable python/ribasim_testmodels" install-pre-commit = "pre-commit install" -install-without-pre-commit = { depends_on = [ +install-ci = { depends_on = [ "install-julia", "update-registry-julia", "install-ribasim-python", "install-ribasim-api", "install-ribasim-testmodels", ] } -install = { depends_on = ["install-without-pre-commit", "install-pre-commit"] } +install = { depends_on = [ + "install-ci", + "install-qgis-plugins", + "install-pre-commit" +] } # Instantiate update-registry-julia = "julia --eval='using Pkg; Registry.update()'" update-manifest-julia = "julia --project --eval='using Pkg; Pkg.update()'"