From bb7179c0f5dab753b9f943f263bcd58ce45b8210 Mon Sep 17 00:00:00 2001 From: Hallie Dunham <70401017+hdunham@users.noreply.github.com> Date: Fri, 13 Feb 2026 12:51:53 -0700 Subject: [PATCH 01/11] point to REopt master branch --- julia_src/Manifest.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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"] From 1040de20a86fe0beda5eed346625665d808cb3b2 Mon Sep 17 00:00:00 2001 From: Hallie Dunham <70401017+hdunham@users.noreply.github.com> Date: Fri, 13 Feb 2026 13:24:05 -0700 Subject: [PATCH 02/11] trigger tests --- julia_src/utils.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 266a0a5464d1898b0b3017e14afe93e940947e34 Mon Sep 17 00:00:00 2001 From: Hallie Dunham <70401017+hdunham@users.noreply.github.com> Date: Fri, 13 Feb 2026 13:43:16 -0700 Subject: [PATCH 03/11] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) 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 From 0297a2e6f54072dcbaa76dd61ef1c10e080baa09 Mon Sep 17 00:00:00 2001 From: Hallie Dunham <70401017+hdunham@users.noreply.github.com> Date: Fri, 13 Feb 2026 18:04:38 -0700 Subject: [PATCH 04/11] Remove existing docker image before building in PR tests --- .github/workflows/pull_request_tests.yml | 2 ++ 1 file changed, 2 insertions(+) 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 From 6a29eeda48ba876fd4f297dcde93c18ae18d1c55 Mon Sep 17 00:00:00 2001 From: Hallie Dunham <70401017+hdunham@users.noreply.github.com> Date: Mon, 16 Feb 2026 19:05:23 -0700 Subject: [PATCH 05/11] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe3b9213a..2bf7d3155 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ Classify the change according to the following categories: ##### Removed ### Patches -## juliamaster +## Develop ### 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) From 9ea8f631d90daee6403e860b0bf6e3adff3e62b5 Mon Sep 17 00:00:00 2001 From: Hallie Dunham <70401017+hdunham@users.noreply.github.com> Date: Mon, 16 Feb 2026 21:40:46 -0700 Subject: [PATCH 06/11] Revert "Remove existing docker image before building in PR tests" This reverts commit 0297a2e6f54072dcbaa76dd61ef1c10e080baa09. --- .github/workflows/pull_request_tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pull_request_tests.yml b/.github/workflows/pull_request_tests.yml index 308e16747..92a96768b 100644 --- a/.github/workflows/pull_request_tests.yml +++ b/.github/workflows/pull_request_tests.yml @@ -26,8 +26,6 @@ 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 From 36a653bd8859edb3e2cece7b01bf4995fd719af2 Mon Sep 17 00:00:00 2001 From: Hallie Dunham <70401017+hdunham@users.noreply.github.com> Date: Wed, 25 Feb 2026 15:29:21 -0700 Subject: [PATCH 07/11] avoid double build of base-api-image --- docker-compose.nginx.yml | 6 ++++-- docker-compose.nojulia.yml | 9 ++++----- docker-compose.yml | 9 ++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docker-compose.nginx.yml b/docker-compose.nginx.yml index 82f33693a..e7a5d24ea 100644 --- a/docker-compose.nginx.yml +++ b/docker-compose.nginx.yml @@ -26,7 +26,7 @@ services: container_name: celery-nginx build: context: . - image: base-api-image + image: base-api-image:latest command: > "celery -A reopt_api worker -l info" environment: @@ -44,7 +44,7 @@ services: - julia-nginx django-nginx: - image: base-api-image + image: base-api-image:latest container_name: django-nginx command: > "python manage.py migrate @@ -65,6 +65,8 @@ services: - 8000 volumes: - .:/opt/reopt + depends_on: + - celery nginx: build: ./nginx diff --git a/docker-compose.nojulia.yml b/docker-compose.nojulia.yml index 1d8c7536d..d61823f71 100644 --- a/docker-compose.nojulia.yml +++ b/docker-compose.nojulia.yml @@ -27,7 +27,7 @@ services: build: context: . dockerfile: Dockerfile - image: base-api-image + image: base-api-image:latest command: > "celery -A reopt_api worker -l info" environment: @@ -44,10 +44,7 @@ services: django: container_name: django-nojul - build: - context: . - dockerfile: Dockerfile - image: base-api-image + image: base-api-image:latest command: > "python manage.py migrate && python manage.py runserver 0.0.0.0:8000" @@ -64,6 +61,8 @@ services: - 8000:8000 volumes: - .:/opt/reopt + depends_on: + - celery volumes: pgdata: diff --git a/docker-compose.yml b/docker-compose.yml index 80cdda5b5..1aa61b612 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,7 @@ services: build: context: . dockerfile: Dockerfile - image: base-api-image + image: base-api-image:latest command: > "celery -A reopt_api worker -l info" environment: @@ -36,10 +36,7 @@ services: - julia django: - build: - context: . - dockerfile: Dockerfile - image: base-api-image + image: base-api-image:latest command: > "python manage.py migrate && /opt/reopt/bin/wait-for-it.bash -t 0 julia:8081 -- python manage.py runserver 0.0.0.0:8000" @@ -56,6 +53,8 @@ services: - 8000:8000 volumes: - .:/opt/reopt + depends_on: + - celery julia: container_name: julia_api From 6ec3fac372141d451eca1b28f6281c6167b7c719 Mon Sep 17 00:00:00 2001 From: Hallie Dunham <70401017+hdunham@users.noreply.github.com> Date: Wed, 25 Feb 2026 15:50:54 -0700 Subject: [PATCH 08/11] consolidate dupe depends_on --- docker-compose.nginx.yml | 2 -- docker-compose.nojulia.yml | 3 +-- docker-compose.yml | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/docker-compose.nginx.yml b/docker-compose.nginx.yml index e7a5d24ea..78648fbc7 100644 --- a/docker-compose.nginx.yml +++ b/docker-compose.nginx.yml @@ -65,8 +65,6 @@ services: - 8000 volumes: - .:/opt/reopt - depends_on: - - celery nginx: build: ./nginx diff --git a/docker-compose.nojulia.yml b/docker-compose.nojulia.yml index d61823f71..556fe0b9e 100644 --- a/docker-compose.nojulia.yml +++ b/docker-compose.nojulia.yml @@ -57,12 +57,11 @@ services: depends_on: - db - redis + - celery ports: - 8000:8000 volumes: - .:/opt/reopt - depends_on: - - celery volumes: pgdata: diff --git a/docker-compose.yml b/docker-compose.yml index 1aa61b612..49d3a3d32 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -49,12 +49,11 @@ services: - db - redis - julia + - celery ports: - 8000:8000 volumes: - .:/opt/reopt - depends_on: - - celery julia: container_name: julia_api From ebffd5afc8e24067f3b1decd86c01cee5c16603f Mon Sep 17 00:00:00 2001 From: Hallie Dunham <70401017+hdunham@users.noreply.github.com> Date: Fri, 27 Feb 2026 17:47:22 -0700 Subject: [PATCH 09/11] point to new registered REopt version --- julia_src/Manifest.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index fa4843dc1..c9e991a94 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -948,9 +948,7 @@ 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 = "91b47616ee38c784c5f454e1ad4ead1b119e818f" -repo-rev = "master" -repo-url = "https://github.com/NREL/REopt.jl.git" +git-tree-sha1 = "50654a593a8b356cdf28043c6a1d7c3ee7cd28db" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" version = "0.57.0" From 1808392143f025faa5f6c992672c1bb2af01e926 Mon Sep 17 00:00:00 2001 From: Hallie Dunham <70401017+hdunham@users.noreply.github.com> Date: Fri, 27 Feb 2026 17:47:25 -0700 Subject: [PATCH 10/11] Update CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bf7d3155..6da7907c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,8 @@ Classify the change according to the following categories: ## Develop ### 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) +- refactor docker-compose files so that base-api-image isn't built twice (in celery and django sections), fixing error "image "docker.io/library/base-api-image:latest": already exists" +- use REopt@0.57.0 ## v3.17.5 ### Minor Updates From 2a271fcb80ab6e28b65053f9fb66cd7bb10a6123 Mon Sep 17 00:00:00 2001 From: Hallie Dunham <70401017+hdunham@users.noreply.github.com> Date: Thu, 5 Mar 2026 22:25:10 -0700 Subject: [PATCH 11/11] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6da7907c1..1531d0c61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,11 +26,11 @@ Classify the change according to the following categories: ##### Removed ### Patches -## Develop +## v3.18.0 ### Minor Updates ##### Changed - refactor docker-compose files so that base-api-image isn't built twice (in celery and django sections), fixing error "image "docker.io/library/base-api-image:latest": already exists" -- use REopt@0.57.0 +- use REopt@0.57.0 (updates to federal sector defaults based on the 2025 NIST Handbook and Annual Supplement; include boiler emissions in emissions calculations) ## v3.17.5 ### Minor Updates