Merge pull request #457 from nasa/release/4.0.0-er.2.0

Release 4.0.0 ER-2.0

.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

examples/dswx_ni_sample_runconfig-v4.0.0-er.1.0.yaml → 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.
 
@@ -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

requirements.txt

@@ -5,7 +5,7 @@ h5py
 Jinja2
 jsonschema
 mgrs
-numpy
+numpy<2
 pandas
 PyYAML
 pylint

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"

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"""
 

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()
 
 
@@ -347,9 +346,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"""
 

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"""