Merge pull request #117 from paulromano/release-0.5.2

nstauff · web-flow · commit 3d40f144bb82 · 2025-04-14T11:34:23.000-05:00
Update version number to 0.5.2 and update copyright
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,20 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.5.2]
 
 ### Added
 
 * The `Plugin.__call__` method now accepts an `output_dir` argument that
   specifies the directory created in the database
   ([#107](https://github.com/watts-dev/watts/pull/107))
-* GCMAT plugin via the `PluginGCMAT` class ([114](https://github.com/watts-dev/watts/pull/114))
+* GCMAT plugin via the `PluginGCMAT` class
+  ([#114](https://github.com/watts-dev/watts/pull/114))
 
 ### Changes
 
 * Update recommendations for Dakota version
   ([#111](https://github.com/watts-dev/watts/pull/111))
-* Update GitHub Actions workflows ([#112](https://github.com/watts-dev/watts/pull/112))
+* Update GitHub Actions workflows
+  ([#112](https://github.com/watts-dev/watts/pull/112))
+* SAS plugin modifications to handle MFUEL output
+  ([#113](https://github.com/watts-dev/watts/pull/113))
 
 ### Fixed
 
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022-2023 UChicago Argonne, LLC
+Copyright (c) 2022-2025 UChicago Argonne, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/doc/source/_static/switcher.json b/doc/source/_static/switcher.json
@@ -4,6 +4,11 @@
         "version": "latest",
         "url": "https://watts.readthedocs.io/en/latest/"
     },
+    {
+        "name": "0.5.2",
+        "version": "v0.5.2",
+        "url": "https://watts.readthedocs.io/en/v0.5.2/"
+    },
     {
         "name": "0.5.1",
         "version": "v0.5.1",
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "watts"
-version = "0.5.2-dev"
+version = "0.5.2"
 authors = [
     { name = "UChicago Argonne, LLC", email = "watts@anl.gov" },
 ]
diff --git a/src/watts/__init__.py b/src/watts/__init__.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from .plugin import *
@@ -21,4 +21,4 @@
 # This allows a user to write watts.Quantity
 from astropy.units import Quantity
 
-__version__ = '0.5.2-dev'
+__version__ = '0.5.2'
diff --git a/src/watts/console.py b/src/watts/console.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 import sys
diff --git a/src/watts/database.py b/src/watts/database.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from collections.abc import Sequence
diff --git a/src/watts/fileutils.py b/src/watts/fileutils.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from contextlib import contextmanager
diff --git a/src/watts/parameters.py b/src/watts/parameters.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from __future__ import annotations
diff --git a/src/watts/plugin.py b/src/watts/plugin.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from abc import ABC, abstractmethod
@@ -144,7 +144,7 @@ def __call__(
             except Exception:
                 # If error occurred, make sure we remove results directory so it
                 # doesn't pollute database
-                shutil.rmtree(workflow_path)
+                #shutil.rmtree(workflow_path)
                 raise
 
         # Add result to database
diff --git a/src/watts/plugin_abce.py b/src/watts/plugin_abce.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from pathlib import Path
diff --git a/src/watts/plugin_accert.py b/src/watts/plugin_accert.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from pathlib import Path
diff --git a/src/watts/plugin_dakota.py b/src/watts/plugin_dakota.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 import csv
diff --git a/src/watts/plugin_mcnp.py b/src/watts/plugin_mcnp.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 import os
diff --git a/src/watts/plugin_moose.py b/src/watts/plugin_moose.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from typing import List, Optional
diff --git a/src/watts/plugin_openmc.py b/src/watts/plugin_openmc.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from functools import lru_cache
diff --git a/src/watts/plugin_pyarc.py b/src/watts/plugin_pyarc.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from pathlib import Path
diff --git a/src/watts/plugin_relap5.py b/src/watts/plugin_relap5.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from pathlib import Path
diff --git a/src/watts/plugin_sas.py b/src/watts/plugin_sas.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 import glob
@@ -184,8 +184,8 @@ def postrun(self, params: Parameters, exec_info: ExecInfo) -> ResultsSAS:
             with open("PRIMAR4.dat", "r") as file_in, open("PRIMAR4.csv", "w") as file_out:
                 subprocess.run(str(self.conv_primar4), stdin=file_in, stdout=file_out)
 
-        if Path("MFUELss_C000001.dat").is_file(): 
-            with open("MFUELss_C000001.dat", "r") as file_in: 
-                subprocess.run(str(self.conv_mfuel), stdin=file_in) 
-   
+        if Path("MFUELss_C000001.dat").is_file():
+            with open("MFUELss_C000001.dat", "r") as file_in:
+                subprocess.run(str(self.conv_mfuel), stdin=file_in)
+
         return super().postrun(params, exec_info)
diff --git a/src/watts/plugin_serpent.py b/src/watts/plugin_serpent.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from typing import List, Optional
diff --git a/src/watts/results.py b/src/watts/results.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from collections import namedtuple
diff --git a/src/watts/template.py b/src/watts/template.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from pathlib import Path
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 import tempfile
diff --git a/tests/test_console.py b/tests/test_console.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 import os
diff --git a/tests/test_database.py b/tests/test_database.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from pathlib import Path
diff --git a/tests/test_fileutils.py b/tests/test_fileutils.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from contextlib import redirect_stdout
diff --git a/tests/test_parameters.py b/tests/test_parameters.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from pathlib import Path
diff --git a/tests/test_plugin.py b/tests/test_plugin.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 import watts
diff --git a/tests/test_plugin_openmc.py b/tests/test_plugin_openmc.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from pathlib import Path
diff --git a/tests/test_results.py b/tests/test_results.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 from pathlib import Path
diff --git a/tests/test_template.py b/tests/test_template.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC
+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC
 # SPDX-License-Identifier: MIT
 
 import watts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2022-2023 UChicago Argonne, LLC`
	`1`	`+Copyright (c) 2022-2025 UChicago Argonne, LLC`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy of`
`4`	`4`	`this software and associated documentation files (the "Software"), to deal in`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"`
`4`	`4`
`5`	`5`	`[project]`
`6`	`6`	`name = "watts"`
`7`		`-version = "0.5.2-dev"`
	`7`	`+version = "0.5.2"`
`8`	`8`	`authors = [`
`9`	`9`	`{ name = "UChicago Argonne, LLC", email = "[email protected]" },`
`10`	`10`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# SPDX-FileCopyrightText: 2022-2023 UChicago Argonne, LLC`
	`1`	`+# SPDX-FileCopyrightText: 2022-2025 UChicago Argonne, LLC`
`2`	`2`	`# SPDX-License-Identifier: MIT`
`3`	`3`
`4`	`4`	`import sys`