Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/pull_request_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hdunham curious if this is something that only needs to be included right now, or should stay here forever?

run: docker rmi docker.io/library/base-api-image:latest || true
- name: Build containers
run: docker compose up -d
- name: Check running containers
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions julia_src/Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion julia_src/utils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down