Skip to content

Commit

Permalink
Merge branch 'main' into allocation_beyond_max_flow
Browse files Browse the repository at this point in the history
  • Loading branch information
SouthEndMusic committed Oct 17, 2023
2 parents 370b08b + d6f84f3 commit 1b2a7bc
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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"
Expand All @@ -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 = """\
Expand Down

0 comments on commit 1b2a7bc

Please sign in to comment.