Merge branch 'develop' into summary-endpoint-updates

.github/workflows/pull_request_tests.yml

@@ -27,14 +27,12 @@ jobs:
           NREL_DEV_API_KEY: ${{ secrets.NREL_DEV_API_KEY }}
         run: ./.github/scripts/make_keys.py.sh 
       - name: Build containers
-        run: docker-compose -f docker-compose.highs.yml up -d
+        run: docker compose up -d
       - name: Check running containers
         run: docker ps -a
       - name: Wait for julia_api
         uses: jakejarvis/wait-action@master
         with:
           time: '150s'
-      - name: test v3 validator
-        run: docker exec reopt_api_celery_1 python manage.py test reoptjl.test.test_validator -v 2 --failfast --no-input          
-      - name: test v3 http.jl endpoints
-        run: docker exec reopt_api_celery_1 python manage.py test reoptjl.test.test_http_endpoints -v 2 --failfast --no-input
+      - name: test v3 (stable)
+        run: docker exec reopt_api-celery-1 python manage.py test reoptjl.test -v 2 --no-input  

.github/workflows/push_tests.yml

@@ -1,4 +1,4 @@
-name: Built-in Tests for Push (Xpress in latest Ubuntu)
+name: Built-in Tests for Push (open source solvers in latest Ubuntu)
 
 on:
 
@@ -23,14 +23,12 @@ jobs:
           NREL_DEV_API_KEY: ${{ secrets.NREL_DEV_API_KEY }}
         run: ./.github/scripts/make_keys.py.sh 
       - name: Build containers
-        run: docker-compose -f docker-compose.highs.yml up -d
+        run: docker compose up -d
       - name: Check running containers
         run: docker ps -a
       - name: Wait for julia_api
         uses: jakejarvis/wait-action@master
         with:
           time: '150s'
-      - name: test v3 validator
-        run: docker exec reopt_api_celery_1 python manage.py test reoptjl.test.test_validator -v 2 --failfast --no-input          
-      - name: test v3 http.jl endpoints
-        run: docker exec reopt_api_celery_1 python manage.py test reoptjl.test.test_http_endpoints -v 2 --failfast --no-input
+      - name: test v3 (stable)
+        run: docker exec reopt_api-celery-1 python manage.py test reoptjl.test -v 2 --no-input        

.gitignore

@@ -117,7 +117,8 @@ docs/formulation/*log
 /.werf_secret_key
 
 # Customized solver setup and docker files
-julia_src/xpress/licenseserver
+julia_src/xpress/
+julia_src/licenseserver
 julia_src/Dockerfile.xpress
 docker-compose.xpress.yml
-julia_src/xpress/solver_setup.sh
+julia_src/solver_setup.sh

CHANGELOG.md

@@ -26,6 +26,16 @@ Classify the change according to the following categories:
     ##### Removed
     ### Patches
 
+## Develop 02-28-2024
+### Minor Updates
+##### Changed
+- Makes **one Julia environment** to avoid needing to update REopt.jl and other dependencies in multiple locations
+- Makes **one http.jl** file with conditional loading for Xpress.jl, if it is installed
+- Changes all the GitHub Actions `test_job_endpoint.py` tests to use an open source solver so we can have full V3 **CI testing** again
+##### Added
+- Adds a **choice of solver** in `Settings.solver_name`, and useful error messages if trying to use Xpress without installation
+- Updated the Wiki in this repo with open source solver setup info
+
 ## v3.4.1
 ### Minor Updates
 #### Fixed

docker-compose.yml

@@ -63,6 +63,10 @@ services:
     container_name: julia_api
     build:
       context: julia_src/
+      dockerfile: Dockerfile
+    environment:
+      - XPRESS_JL_SKIP_LIB_CHECK=True
+      - XPRESS_INSTALLED=False
     command: julia --project=/opt/julia_src http.jl
     ports:
       - "8081:8081"

julia_src/Dockerfile

@@ -7,10 +7,12 @@ ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
 
 # Install Julia packages
 ENV JULIA_NUM_THREADS=2
-WORKDIR /opt/julia_src/
+ENV XPRESS_JL_SKIP_LIB_CHECK=True
+
+WORKDIR /opt/julia_src
 COPY . .
-RUN julia --project="." -e 'import Pkg; Pkg.instantiate();'
-RUN julia --project=. precompile.jl
+RUN julia --project=/opt/julia_src -e 'import Pkg; Pkg.instantiate();'
+RUN julia --project=/opt/julia_src precompile.jl
 EXPOSE 8081
 
 CMD ["bash"]