Merge pull request #492 from nasa/release/3.0.0-rc.3.0

Release v3.0.0 RC.3.0
nasa · Aug 20, 2024 · d42a7e7 · d42a7e7
2 parents e2e2a02 + 030b1d0
commit d42a7e7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/...sp_s1_sample_runconfig-v3.0.0-rc.2.2.yaml → ...sp_s1_sample_runconfig-v3.0.0-rc.3.0.yaml b/...sp_s1_sample_runconfig-v3.0.0-rc.2.2.yaml → ...sp_s1_sample_runconfig-v3.0.0-rc.3.0.yaml
@@ -1,4 +1,4 @@
-# Sample RunConfig for use with the DISP-S1 PGE v3.0.0-rc.2.2
+# Sample RunConfig for use with the DISP-S1 PGE v3.0.0-rc.3.0
 # This RunConfig should require minimal changes in order to be used with the
 # OPERA PCM.
 
@@ -93,7 +93,7 @@ RunConfig:
         ProductIdentifier: DISP_S1
 
         # Product version specific to output products
-        ProductVersion: "0.2"
+        ProductVersion: "0.4"
 
         # Path to the executable to run, path must be reachable from
         # within the Docker container (i.e. findable with a "which" command)

diff --git a/src/opera/pge/disp_s1/disp_s1_pge.py b/src/opera/pge/disp_s1/disp_s1_pge.py
@@ -823,11 +823,10 @@ class DispS1Executor(DispS1PreProcessorMixin, DispS1PostProcessorMixin, PgeExecu
     LEVEL = "L3"
     """Processing Level for DISP-S1 Products"""
 
-    PGE_VERSION = "3.0.0-rc.2.2"
+    PGE_VERSION = "3.0.0-rc.3.0"
     """Version of the PGE (overrides default from base_pge)"""
 
     SAS_VERSION = "0.4.2"  # Gamma release https://github.com/opera-adt/disp-s1/releases/tag/v0.4.2
-    """Version of the SAS wrapped by this PGE, should be updated as needed"""
 
     def __init__(self, pge_name, runconfig_path, **kwargs):
         super().__init__(pge_name, runconfig_path, **kwargs)

diff --git a/src/opera/util/input_validation.py b/src/opera/util/input_validation.py
@@ -324,6 +324,7 @@ def validate_disp_inputs(runconfig, logger, name):
     )
 
     if ('static_layers_files' in dyn_anc_file_group and
+            isinstance(dyn_anc_file_group['static_layers_files'], list) and
             len(dyn_anc_file_group['static_layers_files']) > 0):
         check_input_list(dyn_anc_file_group['static_layers_files'], logger, name,
                          valid_extensions=('.h5',), check_zero_size=True)
@@ -340,12 +341,14 @@ def validate_disp_inputs(runconfig, logger, name):
         check_input(dyn_anc_file_group['dem_file'], logger, name,
                     valid_extensions=('.tif', '.tiff', '.vrt'), check_zero_size=True)
 
-    if ('ionosphere_files' in dyn_anc_file_group
-            and len(dyn_anc_file_group['ionosphere_files']) > 0):
+    if ('ionosphere_files' in dyn_anc_file_group and
+            isinstance(dyn_anc_file_group['ionosphere_files'], list) and
+            len(dyn_anc_file_group['ionosphere_files']) > 0):
         check_input_list(dyn_anc_file_group['ionosphere_files'], logger, name,
                          check_zero_size=True)
 
     if ('troposphere_files' in dyn_anc_file_group and
+            isinstance(dyn_anc_file_group['troposphere_files'], list) and
             len(dyn_anc_file_group['troposphere_files']) > 0):
         check_input_list(dyn_anc_file_group['troposphere_files'], logger, name,
                          valid_extensions=('.nc', '.h5', '.grb'), check_zero_size=True)