Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix getindex of local truth_values with global condition_idx #772

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
a5cd605
pixi: Instantiate consistently (#717)
Hofer-Julian Oct 31, 2023
31275b7
Update to python 3.12, pandas 2.1.2 (#713)
visr Oct 31, 2023
5065be9
Update pre-commit hooks (#724)
github-actions[bot] Nov 1, 2023
14ae29e
Use actions-gh-pages (#725)
Hofer-Julian Nov 1, 2023
5b25a62
Fix quarto publish path
Hofer-Julian Nov 1, 2023
61b2ec4
Back to LP solve per priority (#715)
SouthEndMusic Nov 3, 2023
40400f1
Work around quarto in a cross-platform way (#734)
Hofer-Julian Nov 3, 2023
3f4a15d
Fix rendering docs to PDF (#735)
SouthEndMusic Nov 3, 2023
1627c0c
docs: Fix `quarto-preview` (#741)
Hofer-Julian Nov 6, 2023
6f48d5f
Fix rendering docs to PDF (#737)
SouthEndMusic Nov 6, 2023
d7cabcf
set FractionalFlow inflow equal to outflow (#736)
visr Nov 6, 2023
d240a58
Add compat entries for stdlibs (#739)
visr Nov 6, 2023
fda99d3
Fix test-ribasim-core by adding `using Pkg;` (#742)
deltamarnix Nov 6, 2023
045d9c7
Add installation instructions for `ribasim_api` (#749)
Hofer-Julian Nov 7, 2023
ca9fc6f
Streamline release process to PyPI (#750)
Hofer-Julian Nov 7, 2023
0cba3d6
Add quarto and toml as vs code plugin recommends (#752)
deltamarnix Nov 7, 2023
f1ba4b2
TeamCity change in 'Ribasim / Ribasim' project: runners of 'Build lib…
Nov 8, 2023
a673b6a
TeamCity change in 'Ribasim / Ribasim' project: runners of 'Build rib…
Nov 8, 2023
1827d5c
TeamCity change in 'Ribasim / Ribasim' project: runners of 'Build lib…
Nov 8, 2023
6194502
TeamCity change in 'Ribasim / Ribasim' project: runners of 'Build lib…
Nov 8, 2023
47aa680
Share manifests (#740)
visr Nov 9, 2023
2c7e246
CompatHelper: bump compat for Documenter to 1 for package docs, (keep…
github-actions[bot] Nov 10, 2023
95d552b
CompatHelper: add new compat entry for SciMLBase at version 2 for pac…
github-actions[bot] Nov 10, 2023
92478c7
CompatHelper: add new compat entry for TerminalLoggers at version 0.1…
github-actions[bot] Nov 10, 2023
8366c28
move build code into create_binaries package (#762)
visr Nov 10, 2023
0828b17
update to ruff 1.5, add notebook settings (#763)
visr Nov 10, 2023
3e1d6b9
update to pixi 0.6 (#767)
visr Nov 10, 2023
5f8fe1b
Allocation output file (#743)
SouthEndMusic Nov 10, 2023
316f0f0
Switch to Julia 1.10-rc1 (#738)
visr Nov 10, 2023
70a302d
C4 diagrams (#770)
deltamarnix Nov 10, 2023
98b30d6
Fix getindex of local `truth_values` with global `condition_idx`
visr Nov 10, 2023
0ccc5fe
test multiple control nodes
visr Nov 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
pixi: Instantiate consistently (#717)
Also check in `docs/Manifest.toml`
  • Loading branch information
Hofer-Julian authored and visr committed Nov 13, 2023
commit a5cd605e88a9812b66bf5e643bcd39f9c6179efb
142 changes: 142 additions & 0 deletions docs/Manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.9.3"
manifest_format = "2.0"
project_hash = "f9da26c97b8dd21bb861d490428435c07bbfff72"

[[deps.ANSIColoredPrinters]]
git-tree-sha1 = "574baf8110975760d391c710b6341da1afa48d8c"
uuid = "a4c015fc-c6ff-483c-b24f-f7ea428134e9"
version = "0.0.1"

[[deps.Base64]]
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

[[deps.Dates]]
deps = ["Printf"]
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"

[[deps.DocStringExtensions]]
deps = ["LibGit2"]
git-tree-sha1 = "2fb1e02f2b635d0845df5d7c167fec4dd739b00d"
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
version = "0.9.3"

[[deps.Documenter]]
deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
git-tree-sha1 = "39fd748a73dce4c05a9655475e437170d8fb1b67"
uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
version = "0.27.25"

[[deps.DocumenterMarkdown]]
deps = ["Documenter"]
git-tree-sha1 = "9af057a98652336e30586d8092fac06f8b28ecdc"
uuid = "997ab1e6-3595-5248-9280-8efb232c3433"
version = "0.2.2"

[[deps.IOCapture]]
deps = ["Logging", "Random"]
git-tree-sha1 = "d75853a0bdbfb1ac815478bacd89cd27b550ace6"
uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89"
version = "0.2.3"

[[deps.InteractiveUtils]]
deps = ["Markdown"]
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

[[deps.JSON]]
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a"
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
version = "0.21.4"

[[deps.JSON3]]
deps = ["Dates", "Mmap", "Parsers", "PrecompileTools", "StructTypes", "UUIDs"]
git-tree-sha1 = "95220473901735a0f4df9d1ca5b171b568b2daa3"
uuid = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
version = "1.13.2"

[[deps.LibGit2]]
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"

[[deps.Logging]]
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"

[[deps.Markdown]]
deps = ["Base64"]
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"

[[deps.Mmap]]
uuid = "a63ad114-7e13-5084-954f-fe012c677804"

[[deps.NetworkOptions]]
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
version = "1.2.0"

[[deps.OrderedCollections]]
git-tree-sha1 = "2e73fe17cac3c62ad1aebe70d44c963c3cfdc3e3"
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
version = "1.6.2"

[[deps.Parsers]]
deps = ["Dates", "PrecompileTools", "UUIDs"]
git-tree-sha1 = "716e24b21538abc91f6205fd1d8363f39b442851"
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
version = "2.7.2"

[[deps.PrecompileTools]]
deps = ["Preferences"]
git-tree-sha1 = "03b4c25b43cb84cee5c90aa9b5ea0a78fd848d2f"
uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
version = "1.2.0"

[[deps.Preferences]]
deps = ["TOML"]
git-tree-sha1 = "00805cd429dcb4870060ff49ef443486c262e38e"
uuid = "21216c6a-2e73-6563-6e65-726566657250"
version = "1.4.1"

[[deps.Printf]]
deps = ["Unicode"]
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"

[[deps.REPL]]
deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"

[[deps.Random]]
deps = ["SHA", "Serialization"]
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[[deps.SHA]]
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
version = "0.7.0"

[[deps.Serialization]]
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"

[[deps.Sockets]]
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"

[[deps.StructTypes]]
deps = ["Dates", "UUIDs"]
git-tree-sha1 = "ca4bccb03acf9faaf4137a9abc1881ed1841aa70"
uuid = "856f2bd8-1eba-4b0a-8007-ebc267875bd4"
version = "1.10.0"

[[deps.TOML]]
deps = ["Dates"]
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
version = "1.0.3"

[[deps.Test]]
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[[deps.UUIDs]]
deps = ["Random", "SHA"]
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

[[deps.Unicode]]
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
18 changes: 13 additions & 5 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,16 @@ install-without-pre-commit = { depends_on = [
"install-quartodoc",
] }
install = { depends_on = ["install-without-pre-commit", "install-pre-commit"] }
# Instantiate
instantiate-julia-core = "julia --project=core --eval='using Pkg; Pkg.instantiate()'"
instantiate-julia-docs = "julia --project=docs --eval='using Pkg; Pkg.instantiate()'"
instantiate-julia-build = "julia --project=build/create_binaries --eval='using Pkg; Pkg.instantiate()'"
instantiate-julia = { depends_on = [
"instantiate-julia-core",
"instantiate-julia-docs",
"instantiate-julia-build",
] }
# Docs
instantiate-julia-docs = "julia --project=docs -e \"using Pkg; Pkg.instantiate()\""
build-julia-docs = { cmd = "julia --project=docs docs/make.jl", depends_on = [
"instantiate-julia-docs",
] }
Expand All @@ -52,21 +60,21 @@ lint = { depends_on = [
"mypy-ribasim-api",
] }
# Build
instantiate-build-environment = "cd build/create_binaries && julia --project --eval \"using Pkg; Pkg.instantiate()\""
build-ribasim-cli = { cmd = "cd build/create_binaries && julia --project create_app.jl", depends_on = [
"generate-testmodels",
"instantiate-build-environment",
"instantiate-julia-build",
] }
build-libribasim = { cmd = "cd build/create_binaries && julia --project create_lib.jl", depends_on = [
"generate-testmodels",
"instantiate-build-environment",
"instantiate-julia-build",
] }
build = { depends_on = ["build-ribasim-cli", "build-libribasim"] }
# Test
test-ribasim-python = "pytest --numprocesses=auto python/ribasim/tests"
test-ribasim-api = "pytest --basetemp=python/ribasim_api/tests/temp --junitxml=report.xml python/ribasim_api/tests"
test-ribasim-cli = "pytest --numprocesses=auto --basetemp=build/ribasim_cli/tests/temp --junitxml=report.xml build/ribasim_cli/tests"
test-ribasim-core = { cmd = "julia --project=core --eval 'using Pkg; Pkg.instantiate(); Pkg.test()'", depends_on = [
test-ribasim-core = { cmd = "julia --project=core --eval 'Pkg.test()'", depends_on = [
"instantiate-julia-core",
"generate-testmodels",
] }
generate-testmodels = "python utils/generate-testmodels.py"
Expand Down