diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index 4a840f735..99cbee6a5 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -31,7 +31,7 @@ jobs: pixi-version: "v0.3.0" cache: true - name: Prepare pixi - run: pixi run post-install-without-pre-commit + run: pixi run install-without-pre-commit - name: Prepare model input run: | pixi run generate-testmodels diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 566187765..07625fa9a 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -42,7 +42,7 @@ jobs: pixi-version: "v0.3.0" cache: true - name: Prepare pixi - run: pixi run post-install-without-pre-commit + run: pixi run install-without-pre-commit - 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 eed8c083b..c2c831dc3 100644 --- a/.github/workflows/python_lint.yml +++ b/.github/workflows/python_lint.yml @@ -21,7 +21,7 @@ jobs: pixi-version: "latest" cache: true - name: Prepare pixi - run: pixi run post-install-without-pre-commit + run: pixi run install-without-pre-commit - name: Run mypy on python/ribasim run: | pixi run mypy-ribasim-python diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml index d7ecbf0b0..21cd31556 100644 --- a/.github/workflows/python_tests.yml +++ b/.github/workflows/python_tests.yml @@ -34,7 +34,7 @@ jobs: pixi-version: "v0.3.0" cache: true - name: Prepare pixi - run: pixi run post-install-without-pre-commit + run: pixi run install-without-pre-commit - name: Run tests run: pixi run test-ribasim-python-cov diff --git a/.teamcity/Ribasim_Ribasim/buildTypes/Ribasim_Ribasim_TestRibasimCliWindows.xml b/.teamcity/Ribasim_Ribasim/buildTypes/Ribasim_Ribasim_TestRibasimCliWindows.xml index 1e10017c2..5dca56273 100644 --- a/.teamcity/Ribasim_Ribasim/buildTypes/Ribasim_Ribasim_TestRibasimCliWindows.xml +++ b/.teamcity/Ribasim_Ribasim/buildTypes/Ribasim_Ribasim_TestRibasimCliWindows.xml @@ -15,8 +15,7 @@ - + @@ -84,4 +83,3 @@ pip install --no-deps "python/ribasim_testmodels"]]> - diff --git a/docs/contribute/python.qmd b/docs/contribute/python.qmd index c4890e3ff..07ece0824 100644 --- a/docs/contribute/python.qmd +++ b/docs/contribute/python.qmd @@ -11,8 +11,7 @@ First, set up pixi as described on their getting started [page](https://prefix.d Then set up the environment by running the following commands: ``` -pixi install -pixi run post-install +pixi run install ``` diff --git a/pixi.toml b/pixi.toml index 65317b9ac..eef2412dd 100644 --- a/pixi.toml +++ b/pixi.toml @@ -10,16 +10,16 @@ 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-quartodoc = "pip install quartodoc" -pre-commit-install = "pre-commit install" -post-install-without-pre-commit = { depends_on = [ +install-pre-commit = "pre-commit install" +install-without-pre-commit = { depends_on = [ "install-ribasim-python", "install-ribasim-api", "install-ribasim-testmodels", "install-quartodoc", ] } -post-install = { depends_on = [ - "post-install-without-pre-commit", - "pre-commit-install", +install = { depends_on = [ + "install-without-pre-commit", + "install-pre-commit", ] } # Docs instantiate-julia-docs = "julia --project=docs -e \"using Pkg; Pkg.instantiate()\""