Merge branch 'master' into 456_batch_run_package_fix

Author: jmythms

.github/workflows/integration_tests.yml

@@ -65,7 +65,8 @@ jobs:
           else
             python tests/integration_testing/run_workflow.py --yaml tests/integration_testing/integration_test.yml
           fi
-          mv ./results/*.json ./tests/integration_testing/results/
+          rm -rf ./tests/integration_testing/results/*
+          mv ./results/* ./tests/integration_testing/results/
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -77,6 +78,7 @@ jobs:
           git pull origin $branch_ref
           git add ./tests/integration_testing/results/*.json
           if [[ $(git diff --cached --exit-code) ]]; then
+            git add ./tests/integration_testing/results
             git config --system user.email "github-action@users.noreply.github.com"
             git config --system user.name "GitHub Action"
             git commit -m "Upload results files from CI build"

.gitignore

@@ -108,4 +108,10 @@ _build
 ###################
 
 build/
-scout.egg-info/
+scout.egg-info/
+
+# Exclude #
+###########
+
+!tests/integration_testing/results/plots/tech_potential/*.xlsx
+!tests/integration_testing/results/plots/max_adopt_potential/*.xlsx