From d6f84f3af8ca088a7258b7199b52081f3b2c075b Mon Sep 17 00:00:00 2001 From: Hofer-Julian <30049909+Hofer-Julian@users.noreply.github.com> Date: Tue, 17 Oct 2023 10:53:11 +0200 Subject: [PATCH] Add dependency on testmodel for build binary tasks (#672) The testmodels need to be present for the build process to work I've also formatted, so the diff is slightly bigger than expected --- pixi.toml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pixi.toml b/pixi.toml index 69b4c653b..3abf8dffb 100644 --- a/pixi.toml +++ b/pixi.toml @@ -25,10 +25,7 @@ install-without-pre-commit = { depends_on = [ "install-ribasim-testmodels", "install-quartodoc", ] } -install = { depends_on = [ - "install-without-pre-commit", - "install-pre-commit", -] } +install = { depends_on = ["install-without-pre-commit", "install-pre-commit"] } # Docs instantiate-julia-docs = "julia --project=docs -e \"using Pkg; Pkg.instantiate()\"" build-julia-docs = { cmd = "julia --project=docs docs/make.jl", depends_on = [ @@ -55,8 +52,12 @@ lint = { depends_on = [ "mypy-ribasim-api", ] } # Build -build-ribasim-cli = "cd build/create_binaries && julia --project create_app.jl" -build-libribasim = "cd build/create_binaries && julia --project create_lib.jl" +build-ribasim-cli = { cmd = "cd build/create_binaries && julia --project create_app.jl", depends_on = [ + "generate-testmodels", +] } +build-libribasim = { cmd = "cd build/create_binaries && julia --project create_lib.jl", depends_on = [ + "generate-testmodels", +] } build = { depends_on = ["build-ribasim-cli", "build-libribasim"] } # Test test-ribasim-python = "pytest --numprocesses=auto python/ribasim/tests" @@ -66,11 +67,7 @@ test-ribasim-core = { cmd = "julia --project=core --eval 'using Pkg; Pkg.instant "generate-testmodels", ] } generate-testmodels = "python utils/generate-testmodels.py" -tests = { depends_on = [ - "lint", - "test-ribasim-python", - "test-ribasim-core", -] } +tests = { depends_on = ["lint", "test-ribasim-python", "test-ribasim-core"] } # Codegen generate-schema = "julia --project=docs docs/gen_schema.jl" generate-python = """\