From 03d5bc6584b3e83c7bd173cebb27b9510c9d984e Mon Sep 17 00:00:00 2001 From: Scott Collins Date: Thu, 20 Jun 2024 10:44:24 -0700 Subject: [PATCH 1/4] Updated repository version to 4.0.0-er.2.0 --- ...er.1.0.yaml => dswx_ni_sample_runconfig-v4.0.0-er.2.0.yaml} | 2 +- src/opera/_package.py | 2 +- src/opera/pge/disp_s1/disp_s1_pge.py | 3 +++ src/opera/pge/dswx_ni/dswx_ni_pge.py | 3 --- src/opera/pge/dswx_s1/dswx_s1_pge.py | 3 +++ 5 files changed, 8 insertions(+), 5 deletions(-) rename examples/{dswx_ni_sample_runconfig-v4.0.0-er.1.0.yaml => dswx_ni_sample_runconfig-v4.0.0-er.2.0.yaml} (99%) diff --git a/examples/dswx_ni_sample_runconfig-v4.0.0-er.1.0.yaml b/examples/dswx_ni_sample_runconfig-v4.0.0-er.2.0.yaml similarity index 99% rename from examples/dswx_ni_sample_runconfig-v4.0.0-er.1.0.yaml rename to examples/dswx_ni_sample_runconfig-v4.0.0-er.2.0.yaml index 808ca1ff..514de439 100644 --- a/examples/dswx_ni_sample_runconfig-v4.0.0-er.1.0.yaml +++ b/examples/dswx_ni_sample_runconfig-v4.0.0-er.2.0.yaml @@ -1,4 +1,4 @@ -# Sample RunConfig for use with the DSWx-NI PGE v4.0.0-er.1.0 +# Sample RunConfig for use with the DSWx-NI PGE v4.0.0-er.2.0 # This RunConfig should require minimal changes in order to be used with the # OPERA PCM. diff --git a/src/opera/_package.py b/src/opera/_package.py index ade5392c..603f350f 100644 --- a/src/opera/_package.py +++ b/src/opera/_package.py @@ -7,7 +7,7 @@ Package information for the OPERA PGE repository. """ -__version__ = "3.0.0-rc.2.2" +__version__ = "4.0.0-er.2.0" __title__ = "opera-sds-pge" __summary__ = "OPERA SDS Product Generation Executable (PGE) Repository" __uri__ = "https://github.com/nasa/opera-sds-pge" diff --git a/src/opera/pge/disp_s1/disp_s1_pge.py b/src/opera/pge/disp_s1/disp_s1_pge.py index 8a3b740c..16939565 100644 --- a/src/opera/pge/disp_s1/disp_s1_pge.py +++ b/src/opera/pge/disp_s1/disp_s1_pge.py @@ -822,6 +822,9 @@ class DispS1Executor(DispS1PreProcessorMixin, DispS1PostProcessorMixin, PgeExecu LEVEL = "L3" """Processing Level for DISP-S1 Products""" + PGE_VERSION = "3.0.0-rc.2.2" + """Version of the PGE (overrides default from base_pge)""" + SAS_VERSION = "0.2.8" # Gamma release https://github.com/opera-adt/disp-s1/releases/tag/v0.2.8 """Version of the SAS wrapped by this PGE, should be updated as needed""" diff --git a/src/opera/pge/dswx_ni/dswx_ni_pge.py b/src/opera/pge/dswx_ni/dswx_ni_pge.py index 67b2541d..06b70a10 100755 --- a/src/opera/pge/dswx_ni/dswx_ni_pge.py +++ b/src/opera/pge/dswx_ni/dswx_ni_pge.py @@ -347,9 +347,6 @@ class DSWxNIExecutor(DSWxNIPreProcessorMixin, DSWxNIPostProcessorMixin, PgeExecu LEVEL = "L3" """Processing Level for DSWx-NI Products""" - PGE_VERSION = "4.0.0-er.1.0" - """Version of the PGE (overrides default from base_pge)""" - SAS_VERSION = "0.1" """Version of the SAS wrapped by this PGE, should be updated as needed""" diff --git a/src/opera/pge/dswx_s1/dswx_s1_pge.py b/src/opera/pge/dswx_s1/dswx_s1_pge.py index 56f02c04..b49a9810 100644 --- a/src/opera/pge/dswx_s1/dswx_s1_pge.py +++ b/src/opera/pge/dswx_s1/dswx_s1_pge.py @@ -791,6 +791,9 @@ class DSWxS1Executor(DSWxS1PreProcessorMixin, DSWxS1PostProcessorMixin, PgeExecu LEVEL = "L3" """Processing Level for DSWx-S1 Products""" + PGE_VERSION = "3.0.0-rc.2.1" + """Version of the PGE (overrides default from base_pge)""" + SAS_VERSION = "0.4.2" # CalVal release https://github.com/opera-adt/DSWX-SAR/releases/tag/v0.4.2 """Version of the SAS wrapped by this PGE, should be updated as needed""" From 350ae8e9132f389fb738dfa7b7c18891cbb7c22b Mon Sep 17 00:00:00 2001 From: Scott Collins Date: Thu, 20 Jun 2024 11:20:36 -0700 Subject: [PATCH 2/4] Moved QA executable step to after valdiation of output files for DSWx-NI --- src/opera/pge/dswx_ni/dswx_ni_pge.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/opera/pge/dswx_ni/dswx_ni_pge.py b/src/opera/pge/dswx_ni/dswx_ni_pge.py index 06b70a10..0f55dfca 100755 --- a/src/opera/pge/dswx_ni/dswx_ni_pge.py +++ b/src/opera/pge/dswx_ni/dswx_ni_pge.py @@ -326,10 +326,9 @@ def run_postprocessor(self, **kwargs): """ print(f'Running postprocessor for {self._post_mixin_name}') - self._run_sas_qa_executable() - self._validate_output() self._validate_output_product_filenames() + self._run_sas_qa_executable() self._stage_output_files() From 8ba1fb7d6b5fc4600056cb62536c035149987fce Mon Sep 17 00:00:00 2001 From: Scott Collins Date: Thu, 20 Jun 2024 11:34:54 -0700 Subject: [PATCH 3/4] Moved DSWx-NI SAS log file to scratch_dir in sample runconfigs so it is excluded from output filename validation check --- .../opera_pge_dswx_ni_delivery_0.1_interface_runconfig.yaml | 2 +- examples/dswx_ni_sample_runconfig-v4.0.0-er.2.0.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/scripts/dswx_ni/opera_pge_dswx_ni_delivery_0.1_interface_runconfig.yaml b/.ci/scripts/dswx_ni/opera_pge_dswx_ni_delivery_0.1_interface_runconfig.yaml index 1f90ac0a..46eeb5fc 100644 --- a/.ci/scripts/dswx_ni/opera_pge_dswx_ni_delivery_0.1_interface_runconfig.yaml +++ b/.ci/scripts/dswx_ni/opera_pge_dswx_ni_delivery_0.1_interface_runconfig.yaml @@ -228,4 +228,4 @@ RunConfig: # Save the full-res GeoTIFF Browse image in addition to the PNG save_tif_to_output: True - log_file: /home/dswx_user/output_dir/dswx-ni.log + log_file: /home/dswx_user/scratch_dir/dswx-ni.log diff --git a/examples/dswx_ni_sample_runconfig-v4.0.0-er.2.0.yaml b/examples/dswx_ni_sample_runconfig-v4.0.0-er.2.0.yaml index 514de439..9f5309a3 100644 --- a/examples/dswx_ni_sample_runconfig-v4.0.0-er.2.0.yaml +++ b/examples/dswx_ni_sample_runconfig-v4.0.0-er.2.0.yaml @@ -228,4 +228,4 @@ RunConfig: # Save the full-res GeoTIFF Browse image in addition to the PNG save_tif_to_output: True - log_file: /home/dswx_user/output_dir/dswx-ni.log + log_file: /home/dswx_user/scratch_dir/dswx-ni.log From 0c9b36efba41da518cb3ff43c748a2d01d3ecddc Mon Sep 17 00:00:00 2001 From: Scott Collins Date: Thu, 20 Jun 2024 11:59:29 -0700 Subject: [PATCH 4/4] Pinned numpy version in requirements to less than v2.0.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f8abb26b..0b64dbd5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ h5py Jinja2 jsonschema mgrs -numpy +numpy<2 pandas PyYAML pylint