Skip to content

Commit

Permalink
found consistent library set
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulTalbot-INL committed Mar 13, 2018
1 parent 2a582da commit 4be3a13
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion framework/DataObjects/XDataSet.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
12 changes: 6 additions & 6 deletions scripts/TestHarness/testers/RavenUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down

0 comments on commit 4be3a13

Please sign in to comment.