Removing cbcpy. (#42)

* Removing cbcpy. * Adding windows skip.
idaholab · Aug 23, 2022 · 09b287c · 09b287c
1 parent eb027f4
commit 09b287c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dependencies.xml b/dependencies.xml
@@ -5,8 +5,7 @@
     We need to update LOGOS to use either PySP or mpi-sppy, using 5.7 which will consistent with HERON-->
     <pyomo source="forge"/>
     <coincbc os="mac,linux" skip_check="True" source="forge" />
-    <!-- Windows doesn't have coincbc, so get it through cbcpy? see https://stackoverflow.com/questions/58868054/how-to-install-coincbc-using-conda-->
-    <cbcpy os="windows" source='pip'/>
+    <!-- Windows doesn't have coincbc, so get it through cbcpy? cbcpy doesn't exist in python newer than 3.7, so this is not a good solution. The suggestion to use cbcpy was in https://stackoverflow.com/questions/58868054/how-to-install-coincbc-using-conda-->
     <glpk skip_check="True" source="forge" />
     <ipopt skip_check="True" source="forge" />
   </main>

diff --git a/tests/Scheduling/tests b/tests/Scheduling/tests
@@ -4,6 +4,7 @@
   type  = 'LogosRun'
   input = 'test_scheduling.xml'
   UnorderedCsv = 'test_scheduling.csv'
+  skip_if_OS = 'windows'
  [../]
 
 []