Post-merge fixes

Author: Al Rigazzi

conftest.py

@@ -351,7 +351,7 @@ def get_batch_resources() -> dict:
     def get_base_run_settings(
         exe: str, args: list[str], nodes: int = 1, ntasks: int = 1, **kwargs: t.Any
     ) -> RunSettings:
-        run_args: dict[str, int, str | float | None] = {}
+        run_args: dict[str, int | str | float | None] = {}
 
         if test_launcher == "slurm":
             run_args = {"--nodes": nodes, "--ntasks": ntasks, "--time": "00:10:00"}
@@ -394,7 +394,7 @@ def get_base_run_settings(
     def get_run_settings(
         exe: str, args: list[str], nodes: int = 1, ntasks: int = 1, **kwargs: t.Any
     ) -> RunSettings:
-        run_args: dict[str, int, str | float | None] = {}
+        run_args: dict[str, int | str | float | None] = {}
 
         if test_launcher == "slurm":
             run_args = {"nodes": nodes, "ntasks": ntasks, "time": "00:10:00"}

doc/changelog.md

@@ -55,6 +55,11 @@ Detailed Notes
   `pathlib.Path` instances to provide a single source of truth for SmartSim's
   hidden workspace directories and Dragon launcher log locations.
   ([SmartSim-PR789](https://github.com/CrayLabs/SmartSim/pull/789))
+- Copyright headers have been updated from "2021-2024" to "2021-2025" across
+  271 files including Python source files, configuration files, documentation,
+  tests, Docker files, shell scripts, and other supporting files to reflect the
+  new year.
+  ([SmartSim-PR790](https://github.com/CrayLabs/SmartSim/pull/790))
 - Python 3.12 is now supported. TensorFlow 2.16.2 and PyTorch 2.7.1 library
   files are installed as part of `smart build` process when available. On Mac,
   ONNX runtime 1.22.0 is now installed, together with ONNX 1.16.

smartsim/_core/control/controller.py

@@ -478,12 +478,6 @@ def _launch_orchestrator(
 
         # if the orchestrator was launched as a batch workload
         if orchestrator.batch:
-            metadata_dir = (
-                pathlib.Path(orchestrator.path)
-                / CONFIG.metadata_subdir
-                / "database"
-                / orchestrator.name
-            )
             orc_batch_step, substeps = self._create_batch_job_step(
                 orchestrator, metadata_dir
             )
@@ -496,12 +490,6 @@ def _launch_orchestrator(
 
         # if orchestrator was run on existing allocation, locally, or in allocation
         else:
-            metadata_dir = (
-                pathlib.Path(orchestrator.path)
-                / CONFIG.metadata_subdir
-                / "database"
-                / orchestrator.name
-            )
             db_steps = [
                 (self._create_job_step(db, metadata_dir), db)
                 for db in orchestrator.entities