From 5f49cdfc759c4be162f12a97e09dbfed56b79259 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 14 Apr 2025 10:19:57 -0500 Subject: [PATCH] Update version number to 0.5.2 and update copyright --- CHANGELOG.md | 10 +++++++--- LICENSE | 2 +- doc/source/_static/switcher.json | 5 +++++ pyproject.toml | 2 +- src/watts/__init__.py | 4 ++-- src/watts/console.py | 2 +- src/watts/database.py | 2 +- src/watts/fileutils.py | 2 +- src/watts/parameters.py | 2 +- src/watts/plugin.py | 4 ++-- src/watts/plugin_abce.py | 2 +- src/watts/plugin_accert.py | 2 +- src/watts/plugin_dakota.py | 2 +- src/watts/plugin_mcnp.py | 2 +- src/watts/plugin_moose.py | 2 +- src/watts/plugin_openmc.py | 2 +- src/watts/plugin_pyarc.py | 2 +- src/watts/plugin_relap5.py | 2 +- src/watts/plugin_sas.py | 10 +++++----- src/watts/plugin_serpent.py | 2 +- src/watts/results.py | 2 +- src/watts/template.py | 2 +- tests/conftest.py | 2 +- tests/test_console.py | 2 +- tests/test_database.py | 2 +- tests/test_fileutils.py | 2 +- tests/test_parameters.py | 2 +- tests/test_plugin.py | 2 +- tests/test_plugin_openmc.py | 2 +- tests/test_results.py | 2 +- tests/test_template.py | 2 +- 31 files changed, 47 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72d18fa..59479e2 100644 --- 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 index e4caaad..62ee8cc 100644 --- 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 index e6017ca..a8468d8 100644 --- 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 index 5671b3a..dff713b 100644 --- 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 index 83c0ada..27543d4 100644 --- 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 index 11412cc..db31b1b 100644 --- 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 index d1f489d..7b47957 100644 --- 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 index 02f05b1..196599b 100644 --- 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 index a2e6d61..f2f7e66 100644 --- 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 index 2bf55d9..e87fe64 100644 --- 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 index e2eddac..72ce4a0 100644 --- 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 index 7bfccbb..f10699a 100644 --- 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 index fcba5ba..66ff37e 100644 --- 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 index 6bf192c..f896f94 100644 --- 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 index 0d991c1..0cf2b7e 100644 --- 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 index d32a5c8..d4186bd 100644 --- 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 index 31e6574..38af299 100644 --- 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 index c9720cc..8875873 100644 --- 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 index a431b9c..5d3f5cb 100644 --- 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 index ded4d77..68cd53f 100644 --- 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 index a034a37..5698873 100644 --- 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 index b12d9ee..8d4e9e5 100644 --- 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 index 96eaa70..2ebd355 100644 --- 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 index 9e714c3..dba6d29 100644 --- 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 index 313e67e..c57d767 100644 --- 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 index a2d1156..d418989 100644 --- 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 index a4982f8..0cc0742 100644 --- 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 index 7ca5b85..9990cdd 100644 --- 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 index daf98c3..6bf9e51 100644 --- 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 index cc915cf..a036e73 100755 --- 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 index da592a7..8e8c6fe 100644 --- 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