Unpin the max matplotlib version, which upgrades numpy

armi/bookkeeping/db/database.py

@@ -1097,7 +1097,7 @@ def _readParams(h5group, compTypeName, comps, allowMissing=False):
                     )
                 )
 
-            if data.dtype.type is np.string_:
+            if data.dtype.type is np.bytes_:
                 data = np.char.decode(data)
 
             if attrs.get("specialFormatting", False):
@@ -1291,7 +1291,7 @@ def getHistoriesByLocation(
                         )
                         raise
 
-                    if data.dtype.type is np.string_:
+                    if data.dtype.type is np.bytes_:
                         data = np.char.decode(data)
 
                     if dataSet.attrs.get("specialFormatting", False):
@@ -1450,7 +1450,7 @@ def getHistories(
                             )
                             raise
 
-                        if data.dtype.type is np.string_:
+                        if data.dtype.type is np.bytes_:
                             data = np.char.decode(data)
 
                         if dataSet.attrs.get("specialFormatting", False):

armi/bookkeeping/tests/armiRun-A0032-aHist-ref.txt

@@ -1,5 +1,5 @@
-      (0,0)        (0,1)
-0.00000E+00  0.00000E+00
+  (np.int64(0),np.int64(0))        (0,1)
+                0.00000E+00  0.00000E+00
 
 
 key: residence
@@ -33,7 +33,7 @@ key: ztop
 
 
 key: location
-(7,-1,0)  (0,0,0)
+(7,-1,0)  (np.int64(0),np.int64(0),np.int64(0))
 
 
 EOL        bottom         top      center

armi/reactor/assemblies.py

@@ -1021,7 +1021,7 @@ def getBlocksBetweenElevations(self, zLower, zUpper):
         return blocksHere
 
     def getParamValuesAtZ(
-        self, param, elevations, interpType="linear", fillValue=np.NaN
+        self, param, elevations, interpType="linear", fillValue=np.nan
     ):
         """
         Interpolates a param axially to find it at any value of elevation z.
@@ -1070,7 +1070,7 @@ def getParamValuesAtZ(
         )
         return interpolator(elevations)
 
-    def getParamOfZFunction(self, param, interpType="linear", fillValue=np.NaN):
+    def getParamOfZFunction(self, param, interpType="linear", fillValue=np.nan):
         """
         Interpolates a param axially to find it at any value of elevation z.
 

armi/reactor/components/__init__.py

@@ -132,7 +132,7 @@ def __init__(
         material,
         Tinput,
         Thot,
-        area=np.NaN,
+        area=np.nan,
         modArea=None,
         isotopics=None,
         mergeWith=None,
@@ -224,12 +224,12 @@ def __init__(
         material,
         Tinput,
         Thot,
-        area=np.NaN,
+        area=np.nan,
         op=None,
         isotopics=None,
         mergeWith=None,
         components=None,
-        volume=np.NaN,
+        volume=np.nan,
     ):
         Component.__init__(
             self,

pyproject.toml

@@ -31,10 +31,11 @@ authors = [
 ]
 dependencies = [
     "coverage>=7.2.0", # Code coverage tool. Sadly baked into every Case.
-    "h5py>=3.0,<=3.9 ; python_version < '3.11.0'",
-    "h5py>=3.9 ; python_version >= '3.11.0'", # Needed because our database files are H5 format
+    "h5py>=3.0,<=3.9 ; python_version < '3.10.0'",
+    "h5py>=3.9 ; python_version >= '3.10.0'", # Needed because our database files are H5 format
     "htmltree>=0.7.6", # Our reports have HTML output
-    "matplotlib>=3.5.3,<3.8.0", # Important plotting library
+    "matplotlib>=3.5.3,<=3.8.0 ; python_version < '3.11.0'",
+    "matplotlib>=3.5.3 ; python_version >= '3.11.0'", # Important plotting library
     "numpy>=1.21", # Important math library
     "ordered-set>=3.1.1", # A useful data structure
     "pluggy>=1.2.0", # Central tool behind the ARMI Plugin system
@@ -45,7 +46,8 @@ dependencies = [
     "ruamel.yaml.clib ; python_version >= '3.11.0'", # C-based core of ruamel below
     "ruamel.yaml.clib<=0.2.7 ; python_version < '3.11.0'", # C-based core of ruamel below
     "ruamel.yaml<=0.17.21 ; python_version < '3.11.0'", # Our foundational YAML library
-    "scipy>=1.7.0", # Used for curve-fitting and matrix math
+    "scipy<1.14.0 ; python_version <= '3.10.0'",
+    "scipy>=1.7.0 ; python_version > '3.10.0'", # Used for curve-fitting and matrix math
     "toml>0.9.5", # Needed to parse the pyproject.toml file
     "voluptuous>=0.12.1", # Used to validate YAML data files
     "yamlize==0.7.1", # Custom YAML-to-object library