From 4be3a130f7d51970c937c5f6a97bc03d62eed7a0 Mon Sep 17 00:00:00 2001
From: "Paul W. Talbot" <paul.talbot@inl.gov>
Date: Tue, 13 Mar 2018 15:27:04 -0600
Subject: [PATCH] found consistent library set

---
 framework/DataObjects/XDataSet.py         |  3 ++-
 scripts/TestHarness/testers/RavenUtils.py | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/framework/DataObjects/XDataSet.py b/framework/DataObjects/XDataSet.py
index 637847cbe1..844e5bbfff 100644
--- a/framework/DataObjects/XDataSet.py
+++ b/framework/DataObjects/XDataSet.py
@@ -1550,7 +1550,8 @@ def _setScalingFactors(self,var=None):
         mean = float(self._data[var].mean())
         scale = float(self._data[var].std())
         self._scaleFactors[var] = (mean,scale)
-      except TypeError:
+      except Exception:
+        self.raiseADebug('Had an issue with setting scaling factors for variable "{}". No big deal.'.format(var))
         pass
 
   def _toCSV(self,fileName,start=0,**kwargs):
diff --git a/scripts/TestHarness/testers/RavenUtils.py b/scripts/TestHarness/testers/RavenUtils.py
index 53e150fb27..07c1ded566 100644
--- a/scripts/TestHarness/testers/RavenUtils.py
+++ b/scripts/TestHarness/testers/RavenUtils.py
@@ -32,13 +32,13 @@ def inPython3():
 #This list is made of (module, how to check the version, minimum version,
 # quality assurance module version, maximum version)
 # Deep learning requires Scikit-Learn version at least 0.18
-modules_to_try = [("numpy",'numpy.version.version',"1.8.0","1.13.1",None),
-                  ("h5py",'h5py.__version__','2.4.0','2.6.0',None),
-                  ("scipy",'scipy.__version__',"0.14.0","0.17.1",None),
-                  ("sklearn",'sklearn.__version__',"0.18","0.18.0",None),
+modules_to_try = [("numpy",'numpy.version.version',"1.8.0","1.13.3",None),
+                  ("h5py",'h5py.__version__','2.4.0','2.7.0',None),
+                  ("scipy",'scipy.__version__',"0.14.0","0.19.0",None),
+                  ("sklearn",'sklearn.__version__',"0.18","0.19.0",None),
                   ("xarray",'xarray.__version__',"0.9.5","0.9.6","0.9.6"),
-                  ("pandas",'xarray.__version__',"0.20.0","0.20.3","0.20.3"),
-                  ("matplotlib",'matplotlib.__version__',"1.3.1","1.5.3",None)]
+                  ("pandas",'xarray.__version__',"0.20.0","0.20.3",None),
+                  ("matplotlib",'matplotlib.__version__',"1.3.1","2.0.2",None)]
 
 def __lookUpPreferredVersion(name):
   """