Merge pull request #115 from spacetelescope/release/v0.2.27

Release/v0.2.27

Dockerfile

@@ -45,7 +45,7 @@ RUN ./fix-certs
 RUN  yum remove -y kernel-devel && \
  yum install -y epel-release && \
  yum update  -y && \
- yum install -y \
+ yum install -y --allowerasing \
    emacs-nox \
    make \
    gcc \

caldp-setup

@@ -9,7 +9,7 @@ export PATH=`pwd`/scripts:${PATH}
 export CRDS_CONTEXT=hst_1169.pmap
 
 # Version of stsci/hst-pipeline base image to use
-export BASE_IMAGE_TAG=CALDP_20240813_CAL_final
+export BASE_IMAGE_TAG=2024.10.1.1-mostlycos-py311
 
 # Docker repo
 #

caldp/process.py

@@ -374,6 +374,8 @@ def run(self, exit_code, cmd, *args):
             p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
             for line in p.stdout:
                 log.echo(line.strip().decode("utf-8"))
+            # Wait for process to complete otherwise p.returncode is None and errors don't propagate
+            p.wait()
             if p.returncode in self.ignore_err_nums:
                 log.info("Ignoring error status =", p.returncode)
             elif p.returncode:
@@ -935,6 +937,11 @@ class SvmManager(Manager):
         Runs SVM workflow on dataset_input.out file.
     """
 
+    # In some cases, the inputs to SVM are not suitable for SVM generation.
+    # 55.  Only non-viable or SBC/HRC images in the multi-visit table - no processing done.
+    # 65.  No viable images in single/multi-visit table - no processing done.
+    ignore_err_nums = [55, 65]
+
     def __init__(self, dataset, input_uri, output_uri):
         super().__init__(dataset, input_uri, output_uri)
         self.ipppss = get_svm_obs_set(self.dataset)
@@ -1064,6 +1071,11 @@ class MvmManager(Manager):
         Runs MVM workflow on dataset_input.out file.
     """
 
+    # In some cases, the inputs to SVM are not suitable for SVM generation.
+    # 55.  Only non-viable or SBC/HRC images in the multi-visit table - no processing done.
+    # 65.  No viable images in single/multi-visit table - no processing done.
+    ignore_err_nums = [55, 65]
+
     def __init__(self, dataset, input_uri, output_uri):
         super().__init__(dataset, input_uri, output_uri)
         self.runmultihap = "runmultihap"

changelog.md

@@ -1,4 +1,2 @@
-- default base docker image set to CALDP_mostlyCOS_CAL_rc5
-- default crds update to hst_1169.pmap
-- update to spec-plots 1.36.0
-- fix Dockerfile after switch to stream9 base image
+- Added p.wait() in process.py to propagate errors correctly
+- set 55 and 65 as ignored error numbers in SVM and MVM Manager classes