Skip to content

Commit

Permalink
Updated versions/identifiers for release v1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Scott Collins committed Mar 22, 2023
1 parent 65019d5 commit 0132fca
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .ci/scripts/build_dswx_hls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ BUILD_DATE_TIME=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
# defaults, SAS image should be updated as necessary for new image releases from ADT
[ -z "${WORKSPACE}" ] && WORKSPACE=$(realpath $(dirname $(realpath $0))/../..)
[ -z "${TAG}" ] && TAG="${USER}-dev"
[ -z "${SAS_IMAGE}" ] && SAS_IMAGE="artifactory-fn.jpl.nasa.gov:16001/gov/nasa/jpl/opera/adt/opera/proteus:final_4"
[ -z "${SAS_IMAGE}" ] && SAS_IMAGE="artifactory-fn.jpl.nasa.gov:16001/gov/nasa/jpl/opera/adt/opera/proteus:final_4.1"

echo "WORKSPACE: $WORKSPACE"
echo "IMAGE: $IMAGE"
Expand Down
8 changes: 4 additions & 4 deletions .ci/scripts/test_int_dswx_hls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ SAMPLE_TIME=15
# RUNCONFIG should be the name of the runconfig in s3://operasds-dev-pge/dswx_hls/
[ -z "${WORKSPACE}" ] && WORKSPACE=$(realpath "$(dirname "$(realpath "$0")")"/../..)
[ -z "${PGE_TAG}" ] && PGE_TAG="${USER}-dev"
[ -z "${INPUT_DATA}" ] && INPUT_DATA="dswx_hls_final_4.0_expected_input.zip"
[ -z "${EXPECTED_DATA}" ] && EXPECTED_DATA="dswx_hls_final_4.0_expected_output.zip"
[ -z "${RUNCONFIG}" ] && RUNCONFIG="opera_pge_dswx_hls_delivery_4.0_final_runconfig.yaml"
[ -z "${INPUT_DATA}" ] && INPUT_DATA="dswx_hls_final_4.1_expected_input.zip"
[ -z "${EXPECTED_DATA}" ] && EXPECTED_DATA="dswx_hls_final_4.1_expected_output.zip"
[ -z "${RUNCONFIG}" ] && RUNCONFIG="opera_pge_dswx_hls_delivery_4.1_final_runconfig.yaml"
[ -z "${TMP_ROOT}" ] && TMP_ROOT="$DEFAULT_TMP_ROOT"

# Create the test output directory in the work space
Expand Down Expand Up @@ -156,7 +156,7 @@ do
-v "${output_dir}":/out:ro \
-v "${expected_data_dir}":/exp:ro \
--entrypoint python3 ${PGE_IMAGE}:"${PGE_TAG}" \
proteus-1.0.0/bin/dswx_compare.py \
proteus-1.0.1/bin/dswx_compare.py \
/out/"${output_file}" /exp/"${expected_file}")
echo "$docker_out"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sample RunConfig for use with the DSWx-HLS PGE v1.0.0
# Sample RunConfig for use with the DSWx-HLS PGE v1.0.1
# This RunConfig should require minimal changes in order to be used with the
# OPERA PCM.

Expand Down Expand Up @@ -71,7 +71,7 @@ RunConfig:

# List of command-line options to use with ProgramPath
ProgramOptions:
- /home/conda/proteus-1.0.0/bin/dswx_hls.py
- /home/conda/proteus-1.0.1/bin/dswx_hls.py
- --full-log-format

# The Error Code base value added to the offset values to make
Expand Down
4 changes: 2 additions & 2 deletions src/opera/pge/dswx_hls/dswx_hls_pge.py
Original file line number Diff line number Diff line change
Expand Up @@ -616,10 +616,10 @@ class DSWxHLSExecutor(DSWxHLSPreProcessorMixin, DSWxHLSPostProcessorMixin, PgeEx
LEVEL = "L3"
"""Processing Level for DSWx-HLS Products"""

PGE_VERSION = "1.0.0"
PGE_VERSION = "1.0.1"
"""Version of the PGE (overrides default from base_pge)"""

SAS_VERSION = "1.0.0" # Final release 4.0 https://github.com/nasa/PROTEUS/releases/tag/v1.0.0
SAS_VERSION = "1.0.1" # Final release 4.1 https://github.com/nasa/PROTEUS/releases/tag/v1.0.1
"""Version of the SAS wrapped by this PGE, should be updated as needed with new SAS deliveries"""

def __init__(self, pge_name, runconfig_path, **kwargs):
Expand Down

0 comments on commit 0132fca

Please sign in to comment.