From 5041496b8a1e34d23c05389dc51468f5b929d894 Mon Sep 17 00:00:00 2001
From: "Gabriel J. Soto" <Gabriel.SotoGonzalez@inl.gov>
Date: Fri, 30 Sep 2022 11:07:51 -0600
Subject: [PATCH] merge with #214, update ARMA location, more specific
 dependency

---
 dependencies.xml                                                | 2 +-
 .../HERD/nuclearCase_notebook_match/dispatches_input.xml        | 2 +-
 .../workflows/HERD/nuclearCase_notebook_match/tests             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dependencies.xml b/dependencies.xml
index c5e5974b..ea65a2f5 100644
--- a/dependencies.xml
+++ b/dependencies.xml
@@ -1,7 +1,7 @@
 <dependencies>
   <main>
     <dill/>
-    <dispatches source='pip'/>
+    <dispatches source='pip'>1.0</dispatches>
     <pyomo source='forge'/>
     <pyutilib source='forge'/>
     <glpk source='forge' skip_check='True'/>
diff --git a/tests/integration_tests/workflows/HERD/nuclearCase_notebook_match/dispatches_input.xml b/tests/integration_tests/workflows/HERD/nuclearCase_notebook_match/dispatches_input.xml
index 1a7d5bd1..5185b68a 100644
--- a/tests/integration_tests/workflows/HERD/nuclearCase_notebook_match/dispatches_input.xml
+++ b/tests/integration_tests/workflows/HERD/nuclearCase_notebook_match/dispatches_input.xml
@@ -269,7 +269,7 @@
 
   <DataGenerators>
     <!-- to trigger the use of the JSON LMP signal, name needs to be 'dispatches-test'-->
-    <ARMA name='dispatches-test' variable="TOTALLOAD">%HERON%/tests/workshop/arma_202112_nyiso_def.pk</ARMA>
+    <ARMA name='dispatches-test' variable="TOTALLOAD">%HERON%/tests/integration_tests/ARMA/NYISO/nyiso_arma_2yr.pk</ARMA>
   </DataGenerators>
 
 </HERON>
diff --git a/tests/integration_tests/workflows/HERD/nuclearCase_notebook_match/tests b/tests/integration_tests/workflows/HERD/nuclearCase_notebook_match/tests
index 58c691f1..21076b7c 100644
--- a/tests/integration_tests/workflows/HERD/nuclearCase_notebook_match/tests
+++ b/tests/integration_tests/workflows/HERD/nuclearCase_notebook_match/tests
@@ -7,7 +7,7 @@
     type = OrderedCSV
     output = 'opt_solution__nuclearCase_notebook_match.csv'
     zero_threshold = 1e-6
-	rel_err = 1e-6
+    rel_err = 1e-6
   [../]
  [../]