Merge branch 'main' into newAxialExpLinking

Author: albeanth

.github/workflows/black.yaml

@@ -11,14 +11,15 @@ jobs:
     runs-on: ubuntu-24.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.13'
       - name: Update package index
         run: sudo apt-get update
       - name: Run Linter
         run:  |
           pip install -e .[test]
+          ruff format --check .
           ruff check .

.github/workflows/linting.yaml

@@ -49,7 +49,7 @@ def main():
 
     # If there were any missing files, raise an Error.
     if errors:
-        for (i, line) in errors:
+        for i, line in errors:
             print("Nonexistant file on line {}: {}".format(i, line))
         raise ValueError("Package-data file is incorrect: includes non-existant files.")
 

.github/workflows/validatemanifest.py

@@ -42,6 +42,7 @@
 * Wrap up
 * Quit
 """
+
 # ruff: noqa: F401
 import atexit
 import datetime
@@ -232,8 +233,7 @@ def getApp() -> Optional[apps.App]:
 def _cleanupOnCancel(signum, _frame):
     """Helper function to clean up upon cancellation."""
     print(
-        "Caught Cancel signal ({}); cleaning temporary files and exiting..."
-        "".format(signum),
+        "Caught Cancel signal ({}); cleaning temporary files and exiting...".format(signum),
         file=sys.stderr,
     )
     context.cleanTempDirs()
@@ -289,8 +289,9 @@ def configure(app: Optional[apps.App] = None, permissive=False):
             return
         else:
             raise RuntimeError(
-                "Multiple calls to armi.configure() are not allowed. "
-                "Previous call from:\n{}".format(_ARMI_CONFIGURE_CONTEXT)
+                "Multiple calls to armi.configure() are not allowed. Previous call from:\n{}".format(
+                    _ARMI_CONFIGURE_CONTEXT
+                )
             )
 
     assert not context.BLUEPRINTS_IMPORTED, (
@@ -323,11 +324,7 @@ def applyAsyncioWindowsWorkaround() -> None:
     """
     import asyncio
 
-    if (
-        sys.version_info[0] == 3
-        and sys.version_info[1] >= 8
-        and sys.platform.startswith("win")
-    ):
+    if sys.version_info[0] == 3 and sys.version_info[1] >= 8 and sys.platform.startswith("win"):
         asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
 

armi/__init__.py

@@ -18,6 +18,7 @@
 There are a variety of entry points in the ``cli`` package that define the various run options.
 This invokes them according to command-line user input.
 """
+
 import sys
 import traceback
 

armi/__main__.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 """Code that needs to be executed before most ARMI components are safe to import."""
+
 from armi.nucDirectory import nuclideBases  # noqa: E402
 
 # Nuclide bases get built explicitly here to have better determinism

armi/_bootstrap.py

@@ -19,6 +19,7 @@
 Framework for a specific application. An ``App`` implements a simple interface for
 customizing much of the Framework's behavior.
 """
+
 # ruff: noqa: E402
 import collections
 import importlib
@@ -117,9 +118,7 @@ def pluginManager(self) -> pluginManager.ArmiPluginManager:
     def getSettings(self) -> Dict[str, Setting]:
         """Return a dictionary containing all Settings defined by the framework and all plugins."""
         # Start with framework settings
-        settingDefs = {
-            setting.name: setting for setting in fwSettings.getFrameworkSettings()
-        }
+        settingDefs = {setting.name: setting for setting in fwSettings.getFrameworkSettings()}
 
         # The optionsCache stores options that may have come from a plugin before the setting to
         # which they apply. Whenever a new setting is added, we check to see if there are any
@@ -134,10 +133,7 @@ def getSettings(self) -> Dict[str, Setting]:
                 if isinstance(pluginSetting, settings.Setting):
                     name = pluginSetting.name
                     if name in settingDefs:
-                        raise ValueError(
-                            f"The setting {pluginSetting.name} "
-                            "already exists and cannot be redefined."
-                        )
+                        raise ValueError(f"The setting {pluginSetting.name} already exists and cannot be redefined.")
                     settingDefs[name] = pluginSetting
                     # handle when new setting has modifier in the cache (modifier loaded first)
                     if name in optionsCache:
@@ -154,17 +150,13 @@ def getSettings(self) -> Dict[str, Setting]:
                 elif isinstance(pluginSetting, settings.Default):
                     if pluginSetting.settingName in settingDefs:
                         # modifier loaded after setting, so just apply it (no cache needed)
-                        settingDefs[pluginSetting.settingName].changeDefault(
-                            pluginSetting
-                        )
+                        settingDefs[pluginSetting.settingName].changeDefault(pluginSetting)
                     else:
                         # no setting yet, cache it and apply when it arrives
                         defaultsCache[pluginSetting.settingName] = pluginSetting
                 else:
                     raise TypeError(
-                        "Invalid setting definition found: {} ({})".format(
-                            pluginSetting, type(pluginSetting)
-                        )
+                        "Invalid setting definition found: {} ({})".format(pluginSetting, type(pluginSetting))
                     )
 
         if optionsCache:
@@ -214,8 +206,9 @@ def getParamRenames(self) -> Dict[str, str]:
                 pluginCollisions = renames.keys() & pluginRenames.keys()
                 if pluginCollisions:
                     raise plugins.PluginError(
-                        "The following parameter renames are already defined by another "
-                        "plugin:\n{}".format(pluginCollisions)
+                        "The following parameter renames are already defined by another plugin:\n{}".format(
+                            pluginCollisions
+                        )
                     )
                 renames.update(pluginRenames)
             self._paramRenames = renames, self._pm.counter
@@ -230,9 +223,7 @@ def registerPluginFlags(self):
         armi.plugins.ArmiPlugin.defineFlags
         """
         if self._pluginFlagsRegistered:
-            raise RuntimeError(
-                "Plugin flags have already been registered. Cannot do it twice!"
-            )
+            raise RuntimeError("Plugin flags have already been registered. Cannot do it twice!")
 
         for pluginFlags in self._pm.hook.defineFlags():
             Flags.extend(pluginFlags)
@@ -370,19 +361,15 @@ def splashText(self):
 |        Advanced  Reactor  Modeling Interface      |
 |                                                   |
 |                    version {0:10s}             |
-|                                                   |""".format(
-            meta.__version__
-        )
+|                                                   |""".format(meta.__version__)
 
         # add the name/version of the current App, if it's not the default
         if context.APP_NAME != "armi":
             from armi import getApp
 
             splash += r"""
 |---------------------------------------------------|
-|   {0:>17s} app version {1:10s}        |""".format(
-                context.APP_NAME, getApp().version
-            )
+|   {0:>17s} app version {1:10s}        |""".format(context.APP_NAME, getApp().version)
 
         # bottom border of the splash
         splash += r"""

armi/apps.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 """The bookkeeping package handles data persistence, reporting, and some debugging."""
+
 from armi import plugins
 
 

armi/bookkeeping/__init__.py

@@ -59,6 +59,7 @@
        indices allows for more efficient means of extracting information based on
        location, without having to compose the full model.
 """
+
 import os
 
 from armi import runLog