diff --git a/Manifest.toml b/Manifest.toml index b7c0d6488..f161f91e0 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.0" manifest_format = "2.0" -project_hash = "a2e54351da64b7dac3109810459579d647b75bb7" +project_hash = "1a68754569dae741c9232c9ae2db3512f52c2b80" [[deps.ADTypes]] git-tree-sha1 = "41c37aa88889c171f1300ceac1313c06e891d245" @@ -1254,7 +1254,7 @@ version = "3.5.13" deps = ["Accessors", "Arrow", "BasicModelInterface", "CodecLz4", "CodecZstd", "ComponentArrays", "Configurations", "DBInterface", "DataInterpolations", "DataStructures", "Dates", "Dictionaries", "DiffEqCallbacks", "EnumX", "FiniteDiff", "ForwardDiff", "Graphs", "HiGHS", "IterTools", "JuMP", "Legolas", "Logging", "LoggingExtras", "MetaGraphsNext", "OrdinaryDiffEq", "PreallocationTools", "SQLite", "SciMLBase", "SparseArrays", "StructArrays", "Tables", "TerminalLoggers", "TimeZones", "TimerOutputs", "TranscodingStreams"] path = "core" uuid = "aac5e3d9-0b8f-4d4f-8241-b1a7a9632635" -version = "0.6.0" +version = "0.7.0" [[deps.RuntimeGeneratedFunctions]] deps = ["ExprTools", "SHA", "Serialization"] @@ -1662,12 +1662,6 @@ path = "build/create_binaries" uuid = "3cfb6a46-05f0-43df-bb16-bf763deb14b4" version = "0.1.0" -[[deps.docs]] -deps = ["Configurations", "DataFrames", "Dates", "Documenter", "DocumenterMarkdown", "IJulia", "InteractiveUtils", "JSON3", "Legolas", "Logging", "MarkdownTables", "OrderedCollections", "Ribasim"] -path = "docs" -uuid = "8daea9ca-fc6c-4731-aa85-717fa0b706bc" -version = "0.1.0" - [[deps.libblastrampoline_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850b90-86db-534c-a0d3-1478176c7d93" diff --git a/Project.toml b/Project.toml index 6df86f2b1..ec9276c94 100644 --- a/Project.toml +++ b/Project.toml @@ -5,9 +5,21 @@ description = "Meta-project used to share the Manifest of Ribasim and its depend [deps] Arrow = "69666777-d1a9-59fb-9406-91d4454c9d45" BasicModelInterface = "59605e27-edc0-445a-b93d-c09a3a50b330" +Configurations = "5218b696-f38b-4ac9-8b61-a12ec717816d" +DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" +Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" +Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" +DocumenterMarkdown = "997ab1e6-3595-5248-9280-8efb232c3433" Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6" +IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a" Infiltrator = "5903a43b-9cc3-4c30-8d17-598619ec4e9b" +InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" +JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1" +Legolas = "741b9549-f6ed-4911-9fbf-4a1c0c97f0cd" +Logging = "56ddb016-857b-54e1-b83d-db4d58db5568" +MarkdownTables = "1862ce21-31c7-451e-824c-f20fa3f90fa2" MetaGraphsNext = "fa8bd995-216d-47f1-8a91-f3b68fbeb377" +OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" ReTestItems = "817f1d60-ba6b-4fd5-9520-3cf149f6a823" Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" @@ -18,6 +30,20 @@ Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" TestEnv = "1e6cf692-eddd-4d53-88a5-2d735e33781b" TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53" create_binaries = "3cfb6a46-05f0-43df-bb16-bf763deb14b4" -docs = "8daea9ca-fc6c-4731-aa85-717fa0b706bc" libribasim = "f319f290-633d-4573-adfe-d6d5548b6388" ribasim_cli = "e45c999e-e944-4589-a8e6-7d0b7a60140a" + +[compat] +Configurations = "0.17" +DataFrames = "1" +Dates = "<0.0.1,1" +Documenter = "0.27,1" +DocumenterMarkdown = "0.2" +IJulia = "1" +InteractiveUtils = "<0.0.1,1" +JSON3 = "1.12" +Legolas = "0.5" +Logging = "<0.0.1,1" +MarkdownTables = "1" +OrderedCollections = "1.6" +julia = "1.10" diff --git a/docs/Project.toml b/docs/Project.toml deleted file mode 100644 index 8174017e2..000000000 --- a/docs/Project.toml +++ /dev/null @@ -1,38 +0,0 @@ -name = "docs" -uuid = "8daea9ca-fc6c-4731-aa85-717fa0b706bc" -authors = ["Deltares and contributors "] -description = "Build Ribasim docs and generate schemas" -manifest = "../Manifest.toml" -version = "0.1.0" - -[deps] -Configurations = "5218b696-f38b-4ac9-8b61-a12ec717816d" -DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" -Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" -Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -DocumenterMarkdown = "997ab1e6-3595-5248-9280-8efb232c3433" -IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a" -InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" -JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1" -Legolas = "741b9549-f6ed-4911-9fbf-4a1c0c97f0cd" -Logging = "56ddb016-857b-54e1-b83d-db4d58db5568" -MarkdownTables = "1862ce21-31c7-451e-824c-f20fa3f90fa2" -OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -Ribasim = "aac5e3d9-0b8f-4d4f-8241-b1a7a9632635" -SQLite = "0aa819cd-b072-5ff4-a722-6bc24af294d9" - -[compat] -Configurations = "0.17" -DataFrames = "1" -Dates = "<0.0.1,1" -Documenter = "0.27,1" -DocumenterMarkdown = "0.2" -IJulia = "1" -InteractiveUtils = "<0.0.1,1" -JSON3 = "1.12" -Legolas = "0.5" -Logging = "<0.0.1,1" -MarkdownTables = "1" -OrderedCollections = "1.6" -SQLite = "1.5.1" -julia = "1.10" diff --git a/pixi.toml b/pixi.toml index 8732b2483..fe84712ae 100644 --- a/pixi.toml +++ b/pixi.toml @@ -36,7 +36,7 @@ initialize-julia = { depends_on = [ "instantiate-julia", ] } # Docs -build-julia-docs = { cmd = "julia --project=docs docs/make.jl", depends_on = [ +build-julia-docs = { cmd = "julia --project docs/make.jl", depends_on = [ "initialize-julia", ] } quartodoc-build = { cmd = "quartodoc build && rm objects.json", cwd = "docs" } @@ -44,7 +44,7 @@ quarto-preview = { cmd = "quarto preview docs", depends_on = [ "quartodoc-build", "generate-testmodels" ] } quarto-check = { cmd = "quarto check all", depends_on = ["quartodoc-build"] } -quarto-render = { cmd = "julia --project=docs --eval 'using Pkg; Pkg.build(\"IJulia\")' && quarto render docs --to html --execute", depends_on = [ +quarto-render = { cmd = "julia --project --eval 'using Pkg; Pkg.build(\"IJulia\")' && quarto render docs --to html --execute", depends_on = [ "quartodoc-build", "generate-testmodels" ] } docs = { depends_on = ["build-julia-docs", "quarto-preview"] } @@ -88,7 +88,7 @@ test-ribasim-core-cov = { cmd = "julia --project=core --eval 'using Pkg; Pkg.tes generate-testmodels = "python utils/generate-testmodels.py" tests = { depends_on = ["lint", "test-ribasim-python", "test-ribasim-core"] } # Codegen -generate-schema = { cmd = "julia --project=docs docs/gen_schema.jl" } +generate-schema = { cmd = "julia --project docs/gen_schema.jl" } generate-python = "datamodel-codegen --output-model-type pydantic_v2.BaseModel --base-class ribasim.input_base.BaseModel --use-union-operator --use-title-as-name --use-double-quotes --disable-timestamp --use-default --strict-nullable --input-file-type=jsonschema --input docs/schema/root.schema.json --output python/ribasim/ribasim/models.py" codegen = { depends_on = ["generate-schema", "generate-python", "lint"] } # Publish