update to latest REopt.jl, docker refactor to fix a bug

CHANGELOG.md

@@ -26,6 +26,12 @@ Classify the change according to the following categories:
     ##### Removed
     ### Patches
 
+## 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 (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
 ##### Added

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

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"
@@ -60,6 +57,7 @@ services:
     depends_on:
       - db
       - redis
+      - celery
     ports:
       - 8000:8000
     volumes:

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"
@@ -52,6 +49,7 @@ services:
       - db
       - redis
       - julia
+      - celery
     ports:
       - 8000:8000
     volumes:

julia_src/Manifest.toml

@@ -948,9 +948,9 @@ 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 = "50654a593a8b356cdf28043c6a1d7c3ee7cd28db"
 uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6"
-version = "0.56.2"
+version = "0.57.0"
 
 [[deps.Random]]
 deps = ["SHA"]

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)