diff --git a/CHANGELOG.md b/CHANGELOG.md index 9decced60..7cb666ba7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,11 @@ Classify the change according to the following categories: ##### Removed ### Patches +## v3.22.1 +### Patches +- Upgrades solver stack dependencies in Julia environment +- Updates internally-used developer key environment variables to NLR from NREL for Julia environment + ## v3.22.0 ### Minor Updates ##### Added diff --git a/julia_src/.env b/julia_src/.env index d5ff11f76..e181af83e 100644 --- a/julia_src/.env +++ b/julia_src/.env @@ -1,2 +1,2 @@ -NREL_DEVELOPER_API_KEY="gAfosXcQ9Ldfw3qXqvKVb7PxMEkYigozmC9R3mXQ" -NREL_DEVELOPER_EMAIL="reopt@nlr.gov" \ No newline at end of file +NLR_DEVELOPER_API_KEY="gAfosXcQ9Ldfw3qXqvKVb7PxMEkYigozmC9R3mXQ" +NLR_DEVELOPER_EMAIL="reopt@nlr.gov" \ No newline at end of file diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index 33c6899ee..116e1a676 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -72,12 +72,6 @@ version = "0.4.7" uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" version = "1.11.0" -[[deps.BenchmarkTools]] -deps = ["Compat", "JSON", "Logging", "Printf", "Profile", "Statistics", "UUIDs"] -git-tree-sha1 = "e38fbc49a620f5d0b660d7f543db1009fe0f8336" -uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" -version = "1.6.0" - [[deps.BitFlags]] git-tree-sha1 = "0691e34b3bb8be9307330f88d1a3c3f25466c24d" uuid = "d1d4a3ce-64b1-5f1a-9ba4-7e7e69966f35" @@ -461,16 +455,16 @@ uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" version = "1.10.16" [[deps.HiGHS]] -deps = ["HiGHS_jll", "MathOptInterface", "PrecompileTools", "SparseArrays"] -git-tree-sha1 = "219becee955e18b349be83d74bdd2e5ad4804d0f" +deps = ["HiGHS_jll", "LinearAlgebra", "MathOptIIS", "MathOptInterface", "OpenBLAS32_jll", "PrecompileTools", "SparseArrays"] +git-tree-sha1 = "01a5241985559c08a5baadbcebd6d87daaf84a84" uuid = "87dc4568-4c63-4d18-b0c0-bb2238e4078b" -version = "1.15.0" +version = "1.24.1" [[deps.HiGHS_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Zlib_jll"] -git-tree-sha1 = "72bceb63d4ae3683f091f812b6958a199c494a1b" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Zlib_jll", "libblastrampoline_jll"] +git-tree-sha1 = "2d9747b79d17c4320fe48048a3a768fe6d6d82de" uuid = "8fd58aa0-07eb-5a78-9b36-339c94fd15ea" -version = "1.10.0+0" +version = "1.15.1+1" [[deps.Hwloc_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -567,18 +561,6 @@ 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 = "196b41e5a854b387d99e5ede2de3fcb4d0422aae" -uuid = "0f8b85d8-7281-11e9-16c2-39a750bddbf1" -version = "1.14.2" - - [deps.JSON3.extensions] - JSON3ArrowExt = ["ArrowTypes"] - - [deps.JSON3.weakdeps] - ArrowTypes = "31f734f8-188a-4ce0-8406-c8a06bd891cd" - [[deps.JpegTurbo_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "eac1206917768cb54957c65a615460d87b455fc1" @@ -587,9 +569,9 @@ version = "3.1.1+0" [[deps.JuMP]] deps = ["LinearAlgebra", "MacroTools", "MathOptInterface", "MutableArithmetics", "OrderedCollections", "PrecompileTools", "Printf", "SparseArrays"] -git-tree-sha1 = "c9ace86360c1dc0635de5f9e2ce5143b86c53311" +git-tree-sha1 = "614b22ff014355192982b1f9a12c61298ce6a908" uuid = "4076af6c-e467-56ae-b986-b466b2749572" -version = "1.25.0" +version = "1.31.1" [deps.JuMP.extensions] JuMPDimensionalDataExt = "DimensionalData" @@ -751,11 +733,25 @@ deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" version = "1.11.0" +[[deps.MathOptIIS]] +deps = ["MathOptInterface"] +git-tree-sha1 = "3b3d69130d8ab8c39d5fa4d30e20a8e6428c9d37" +uuid = "8c4f8055-bd93-4160-a86b-a0c04941dbff" +version = "0.2.0" + [[deps.MathOptInterface]] -deps = ["BenchmarkTools", "CodecBzip2", "CodecZlib", "DataStructures", "ForwardDiff", "JSON3", "LinearAlgebra", "MutableArithmetics", "NaNMath", "OrderedCollections", "PrecompileTools", "Printf", "SparseArrays", "SpecialFunctions", "Test"] -git-tree-sha1 = "c2514ede436071529470010540bc3a1441e8140c" +deps = ["CodecBzip2", "CodecZlib", "ForwardDiff", "JSON", "LinearAlgebra", "MutableArithmetics", "NaNMath", "OrderedCollections", "PrecompileTools", "Printf", "SparseArrays", "SpecialFunctions", "Test"] +git-tree-sha1 = "f1ccd9ffcb8577e207deb9aaebeb3f961de70380" uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" -version = "1.39.0" +version = "1.52.0" + + [deps.MathOptInterface.extensions] + MathOptInterfaceBenchmarkToolsExt = "BenchmarkTools" + MathOptInterfaceCliqueTreesExt = "CliqueTrees" + + [deps.MathOptInterface.weakdeps] + BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" + CliqueTrees = "60701a23-6482-424a-84db-faee86b9b1f8" [[deps.MbedTLS]] deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "NetworkOptions", "Random", "Sockets"] @@ -942,10 +938,6 @@ deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" version = "1.11.0" -[[deps.Profile]] -uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79" -version = "1.11.0" - [[deps.REopt]] deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"] git-tree-sha1 = "ee0a326950726f2bd9b04f0a69475d05919fa53d" @@ -1108,12 +1100,6 @@ git-tree-sha1 = "725421ae8e530ec29bcbdddbe91ff8053421d023" uuid = "892a3eda-7b42-436c-8928-eab12a02cf0e" version = "0.4.1" -[[deps.StructTypes]] -deps = ["Dates", "UUIDs"] -git-tree-sha1 = "159331b30e94d7b11379037feeb9b690950cace8" -uuid = "856f2bd8-1eba-4b0a-8007-ebc267875bd4" -version = "1.11.0" - [[deps.SuiteSparse_jll]] deps = ["Artifacts", "Libdl", "libblastrampoline_jll"] uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" diff --git a/julia_src/http.jl b/julia_src/http.jl index e52baf7b5..3f352618d 100644 --- a/julia_src/http.jl +++ b/julia_src/http.jl @@ -5,9 +5,9 @@ import REopt as reoptjl # For REopt.jl, needed because we still have local REop using DotEnv DotEnv.load!() -const test_nrel_developer_api_key = ENV["NREL_DEVELOPER_API_KEY"] +const test_nlr_developer_api_key = ENV["NLR_DEVELOPER_API_KEY"] -ENV["NREL_DEVELOPER_EMAIL"] = "reopt@nlr.gov" +ENV["NLR_DEVELOPER_EMAIL"] = "reopt@nlr.gov" include("heuristic_dispatch_sizing.jl") include("mpc.jl") @@ -61,9 +61,9 @@ function reopt(req::HTTP.Request) d = JSON.parse(String(req.body)) error_response = Dict() if !isempty(get(d, "api_key", "")) - ENV["NREL_DEVELOPER_API_KEY"] = pop!(d, "api_key") + ENV["NLR_DEVELOPER_API_KEY"] = pop!(d, "api_key") else - ENV["NREL_DEVELOPER_API_KEY"] = test_nrel_developer_api_key + ENV["NLR_DEVELOPER_API_KEY"] = test_nlr_developer_api_key delete!(d, "api_key") end @@ -909,9 +909,9 @@ function mpc(req::HTTP.Request) results = Dict() try if !isempty(get(d, "api_key", "")) - ENV["NREL_DEVELOPER_API_KEY"] = pop!(d, "api_key") + ENV["NLR_DEVELOPER_API_KEY"] = pop!(d, "api_key") else - ENV["NREL_DEVELOPER_API_KEY"] = test_nrel_developer_api_key + ENV["NLR_DEVELOPER_API_KEY"] = test_nlr_developer_api_key delete!(d, "api_key") end