Update to ray2 and some other libraries.

dependencies.xml

@@ -38,12 +38,12 @@ Note all install methods after "main" take
     <h5py/>
     <numpy>1.18</numpy>
     <scipy>1.5</scipy>
-    <scikit-learn>0.24</scikit-learn>
+    <scikit-learn>1.0</scikit-learn>
     <pandas>1.1</pandas>
     <xarray>0.16</xarray>
     <netcdf4>1.5</netcdf4>
     <matplotlib>3.2</matplotlib>
-    <statsmodels>0.12</statsmodels>
+    <statsmodels>0.13</statsmodels>
     <cloudpickle>1.6</cloudpickle>
     <tensorflow os='windows,linux'>2.3</tensorflow>
     <tensorflow os='mac'>2.7</tensorflow>
@@ -60,7 +60,7 @@ Note all install methods after "main" take
     <nomkl os='linux' skip_check='True'/>
     <numexpr os='linux'/>
     <cmake skip_check='True' optional='True'/>
-    <ray source="pip" pip_extra="[default]">1.12</ray>
+    <ray source="pip" pip_extra="[default]">2.0</ray>
     <!-- redis is needed by ray, but on windows, this seems to need to be explicitly stated -->
     <redis source="pip" os='windows'/>
     <imageio>2.9</imageio>

ravenframework/CodeInterfaceClasses/PHISICS/MaterialParser.py

@@ -86,8 +86,8 @@ def dictFormatingFromXmlToPerturbed(self):
     matList = []
     isotopeList = []
     XMLdict['density'] = {}
-    for matXML in self.root.getiterator('mat'):
-      for isotopeXML in self.root.getiterator('isotope'):
+    for matXML in self.root.iter('mat'):
+      for isotopeXML in self.root.iter('isotope'):
         matList.append(matXML.attrib.get('id'))
         isotopeList.append(self.noDash(isotopeXML.attrib.get('id')))
     matList = self.unifyElements(matList)
@@ -96,7 +96,7 @@ def dictFormatingFromXmlToPerturbed(self):
       XMLdict['density'][mat] = {}
       for isotope in isotopeList:
         XMLdict['density'][mat][isotope] = {}
-    for matXML in self.root.getiterator('mat'):
+    for matXML in self.root.iter('mat'):
       for isotopeXML in matXML.findall('isotope'):
         XMLdict['density'][matXML.attrib.get('id')][self.noDash(isotopeXML.attrib.get('id'))] = isotopeXML.attrib.get('density')
     return XMLdict
@@ -148,7 +148,7 @@ def printInput(self,workingDir):
     newXMLDict = self.replaceValues(genericXMLdict)
     templatedNewXMLdict = self.fileReconstruction(newXMLDict)
     open(self.inputFiles, 'w')
-    for matXML in self.root.getiterator('mat'):
+    for matXML in self.root.iter('mat'):
       for isotopeXML in matXML.findall('isotope'):
         isotopeXML.attrib['density'] = templatedNewXMLdict.get('DENSITY').get(matXML.attrib.get('id').upper()).get(self.noDash(isotopeXML.attrib.get('id')).upper())
         self.tree.write(self.inputFiles)

ravenframework/CodeInterfaceClasses/PHISICS/PhisicsInterface.py

@@ -58,7 +58,7 @@ def outputFileNames(self, pathFile):
         'flux', 'repository'
     ]
     for xmlNodeNumber in range(0, len(xmlNodes)):
-      for xmlNode in pathRoot.getiterator(xmlNodes[xmlNodeNumber]):
+      for xmlNode in pathRoot.iter(xmlNodes[xmlNodeNumber]):
         self.outputFileNameDict[xmlNodes[xmlNodeNumber]] = xmlNode.text
 
   def syncLibPathFileWithRavenInp(self, pathFile, currentInputFiles,
@@ -85,7 +85,7 @@ def syncLibPathFileWithRavenInp(self, pathFile, currentInputFiles,
     ]
 
     for typeNumber in range(len(typeList)):
-      for libPathText in pathRoot.getiterator(libPathList[typeNumber]):
+      for libPathText in pathRoot.iter(libPathList[typeNumber]):
         libPathText.text = os.path.join(
             currentInputFiles[keyWordDict[typeList[typeNumber].lower()]]
             .subDirectory, currentInputFiles[keyWordDict[typeList[typeNumber]

ravenframework/CodeInterfaceClasses/PHISICS/PhisicsRelapInterface.py

@@ -98,7 +98,7 @@ def depTime(self,inputXML,searchDict,dictKeys):
     libraryTree = ET.parse(inputXML)
     libraryRoot = libraryTree.getroot()
     for key in searchDict:
-      for child in libraryRoot.getiterator(searchDict[key]):
+      for child in libraryRoot.iter(searchDict[key]):
         timeDict[dictKeys[key]] = child.text
     return timeDict
 

ravenframework/CodeInterfaceClasses/PHISICS/XSCreator.py

@@ -48,11 +48,11 @@ def tabMapping(self,tab,tabMapFileName):
     """
     mappingTree = ET.parse(tabMapFileName)
     mappingRoot = mappingTree.getroot()
-    for tabulationXML in mappingRoot.getiterator('tabulation'):
+    for tabulationXML in mappingRoot.iter('tabulation'):
       if tab == tabulationXML.attrib.get('set'):
         tabList = []
         valueList = []
-        for tabXML in tabulationXML.getiterator('tab'):
+        for tabXML in tabulationXML.iter('tab'):
           tabList.append(tabXML.attrib.get('name'))
           valueList.append(tabXML.text)
     return tabList, valueList

ravenframework/CodeInterfaceClasses/PHISICS/phisicsdata.py

@@ -250,11 +250,11 @@ def getAbsoluteXS(self, xsOutput):
     valueList = []
     tree = ET.parse(os.path.join(self.workingDir, xsOutput))
     root = tree.getroot()
-    for materialXML in root.getiterator('library'):
-      for isotopeXML in materialXML.getiterator('isotope'):
+    for materialXML in root.iter('library'):
+      for isotopeXML in materialXML.iter('isotope'):
         reactionList = [j.tag for j in isotopeXML]
         for react in reactionList:
-          for groupXML in isotopeXML.getiterator(react):
+          for groupXML in isotopeXML.iter(react):
             individualGroup = [
                 x.strip() for x in groupXML.attrib.get('g').split(',')
             ]

ravenframework/utils/Debugging.py

@@ -18,7 +18,8 @@
 """
 import sys
 from numbers import Number
-from collections import Set, Mapping, deque
+from collections import deque
+from collections.abc import Set, Mapping
 import numpy as np
 
 # these types have no depth, so should not be searched for subitems