diff --git a/.gitignore b/.gitignore index 392e787..6241671 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ #################################################### # GeoIPS Environment specific .gitignore options: +# auto-generated plugin registry file +registered_plugins.json # auto-generated version file, created at run-time _version.py # auto-generated diff images for test outputs diff --git a/data_fusion/plugins/modules/procflows/data_fusion.py b/data_fusion/plugins/modules/procflows/data_fusion.py index e89b7f2..6130c4e 100644 --- a/data_fusion/plugins/modules/procflows/data_fusion.py +++ b/data_fusion/plugins/modules/procflows/data_fusion.py @@ -22,6 +22,7 @@ from geoips.interfaces import algorithms from geoips.interfaces import readers from geoips.interfaces import products +from geoips.interfaces import output_checkers from geoips.filenames.duplicate_files import remove_duplicates @@ -526,7 +527,9 @@ def call(fnames, command_line_args=None): # with the best-available information. # The METADATA will be updated once all algorithms/products have been applied. area_defs = get_area_defs_from_command_line_args( - command_line_args, {"METADATA": fuse_data["final"]["metadata_xobj"]} + command_line_args, + {"METADATA": fuse_data["final"]["metadata_xobj"]}, + filter_time=True, ) output_checker_kwargs = command_line_args.get("output_checker_kwargs", {}) @@ -625,10 +628,9 @@ def call(fnames, command_line_args=None): retval = 0 if compare_path: - from geoips.interfaces.module_based.output_checkers import output_checkers - for output_product in final_products: - output_checker = output_checkers.get_plugin(output_product) + plugin_name = output_checkers.identify_checker(output_product) + output_checker = output_checkers.get_plugin(plugin_name) kwargs = {} if output_checker.name in output_checker_kwargs: kwargs = output_checker_kwargs[output_checker.name] diff --git a/docs/source/releases/index.rst b/docs/source/releases/index.rst index 3fc3061..62e3ac4 100644 --- a/docs/source/releases/index.rst +++ b/docs/source/releases/index.rst @@ -16,18 +16,28 @@ Release Notes ************* +Version 1.12 +------------ + +.. toctree:: + :maxdepth: 1 + + v1_12_0 + Version 1.11 ------------ .. toctree:: :maxdepth: 1 + v1_11_7 + v1_11_7a0 + v1_11_6 v1_11_3 v1_11_3a0 v1_11_2 v1_11_1 v1_11_0 - v1_11_7a0 Version 1.10 ------------ diff --git a/docs/source/releases/v1_11_3.rst b/docs/source/releases/v1_11_3.rst index 0fae4e4..0da766f 100644 --- a/docs/source/releases/v1_11_3.rst +++ b/docs/source/releases/v1_11_3.rst @@ -11,13 +11,13 @@ | # # # https://github.com/U-S-NRL-Marine-Meteorology-Division/ Version 1.11.3 (2023-09-20) -************************************** +*************************** Release Updates =============== Add 1.11.3 release note ---------------------------- +----------------------- *From issue GEOIPS#363: 2023-09-20, version update* diff --git a/docs/source/releases/v1_11_6.rst b/docs/source/releases/v1_11_6.rst new file mode 100644 index 0000000..ff57c85 --- /dev/null +++ b/docs/source/releases/v1_11_6.rst @@ -0,0 +1,31 @@ + | # # # Distribution Statement A. Approved for public release. Distribution unlimited. + | # # # + | # # # Author: + | # # # Naval Research Laboratory, Marine Meteorology Division + | # # # + | # # # This program is free software: you can redistribute it and/or modify it under + | # # # the terms of the NRLMMD License included with this program. This program is + | # # # distributed WITHOUT ANY WARRANTY; without even the implied warranty of + | # # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the included license + | # # # for more details. If you did not receive the license, for more information see: + | # # # https://github.com/U-S-NRL-Marine-Meteorology-Division/ + +Version 1.11.6 (2023-10-26) +*************************** + +* Allow returning a single TC storm time rather than full list + +Bug fixes +========= + +Allow returning a single TC storm time rather than full list +------------------------------------------------------------ + +Add filter_time=True to the get_area_defs_from_command_line_args +call. This allows returning only a single TC storm time, rather +than the full list (to mirror how TC sectors are handled in single +source procflow). + +:: + + modified: data_fusion/plugins/modules/procflows/data_fusion.py diff --git a/docs/source/releases/v1_11_7.rst b/docs/source/releases/v1_11_7.rst new file mode 100644 index 0000000..5cb8db1 --- /dev/null +++ b/docs/source/releases/v1_11_7.rst @@ -0,0 +1,28 @@ + | # # # Distribution Statement A. Approved for public release. Distribution unlimited. + | # # # + | # # # Author: + | # # # Naval Research Laboratory, Marine Meteorology Division + | # # # + | # # # This program is free software: you can redistribute it and/or modify it under + | # # # the terms of the NRLMMD License included with this program. This program is + | # # # distributed WITHOUT ANY WARRANTY; without even the implied warranty of + | # # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the included license + | # # # for more details. If you did not receive the license, for more information see: + | # # # https://github.com/U-S-NRL-Marine-Meteorology-Division/ + +Version 1.11.7 (2023-11-07) +*************************** + +Release Updates +=============== + +Add 1.11.7 release note +----------------------- + +*From issue GEOIPS#393: 2023-11-07, version update* + +:: + + modified: CHANGELOG.rst + new file: docs/source/releases/v1_11_7.rst + modified: docs/source/releases/index.rst diff --git a/docs/source/releases/v1_12_0.rst b/docs/source/releases/v1_12_0.rst new file mode 100644 index 0000000..5e65678 --- /dev/null +++ b/docs/source/releases/v1_12_0.rst @@ -0,0 +1,60 @@ + | # # # Distribution Statement A. Approved for public release. Distribution unlimited. + | # # # + | # # # Author: + | # # # Naval Research Laboratory, Marine Meteorology Division + | # # # + | # # # This program is free software: you can redistribute it and/or modify it under + | # # # the terms of the NRLMMD License included with this program. This program is + | # # # distributed WITHOUT ANY WARRANTY; without even the implied warranty of + | # # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the included license + | # # # for more details. If you did not receive the license, for more information see: + | # # # https://github.com/U-S-NRL-Marine-Meteorology-Division/ + +Version 1.12.0 (2023-12-14) +*************************** + +* Bug fixes + + * Call identify_checker and get_plugin separately for output_checkers + +Bug Fixes +========= + +Call identify_checker and get_plugin separately for output_checkers +------------------------------------------------------------------- + +*From GEOIPS#422: 2023-12-14, 1.12.0 release bug fixes* + +* Call identify checker and get_plugin separately from procflows + + * Rather than having a special case in base.py get_plugin and + output_checkers get_plugin which allowed passing in full paths + to output products and automatically identifying the checker + name and opening it, just explicitly call ``identify_checker`` + and ``get_plugin`` separately from the procflows. + * single_source, config_based, and data_fusion procflows all now + call ``identify_checker`` on the output product filename, and + ``get_plugin`` on the resulting checker plugin name. + * This simplified a lot of logic in both ``output_checkers`` and + ``interfaces/base.py``. Supporting passing a filename to + ``output_checkers.get_plugin()`` was unnecessarily complicated. + +:: + + M geoips/plugins/modules/procflows/data_fusion.py + +Release Process +=============== + +Add release note for v1.12.0 +---------------------------- + +*From GEOIPS#422: 2023-12-14, 1.12.0 release process updates* + +All updates until the next release (v1.12.0) will be included in +this release note. + +:: + + modified: docs/source/releases/v1_12_0.rst + modified: docs/source/releases/index.rst