diff --git a/.github/workflows/pull_request_tests.yml b/.github/workflows/pull_request_tests.yml index 92a96768b..308e16747 100644 --- a/.github/workflows/pull_request_tests.yml +++ b/.github/workflows/pull_request_tests.yml @@ -26,6 +26,8 @@ jobs: env: NREL_DEV_API_KEY: ${{ secrets.NREL_DEV_API_KEY }} run: ./.github/scripts/make_keys.py.sh + - name: Remove existing base-api-image + run: docker rmi docker.io/library/base-api-image:latest || true - name: Build containers run: docker compose up -d - name: Check running containers diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b357f9bc..fe3b9213a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,11 @@ Classify the change according to the following categories: ##### Removed ### Patches +## juliamaster +### Minor Updates +##### Changed +- point to the master branch of REopt.jl instead of the latest registered version (temporary solution while resolving Julia Registry issues caused by REopt.jl repo url name change due to lab renaming) + ## v3.17.5 ### Minor Updates ##### Added diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index b0930d9ab..fa4843dc1 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -948,9 +948,11 @@ 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 = "00bb39c8f932a3320960f01adc139229c24e12b7" +git-tree-sha1 = "91b47616ee38c784c5f454e1ad4ead1b119e818f" +repo-rev = "master" +repo-url = "https://github.com/NREL/REopt.jl.git" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" -version = "0.56.2" +version = "0.57.0" [[deps.Random]] deps = ["SHA"] diff --git a/julia_src/utils.jl b/julia_src/utils.jl index a1d05ae15..1c1af3b3b 100644 --- a/julia_src/utils.jl +++ b/julia_src/utils.jl @@ -19,7 +19,7 @@ function filter_dict_to_match_struct_field_names(d::Dict, s::DataType) end end return d2 -end +end """ array_of_array_to_2D_array(aa)