S1c update

.github/workflows/test.yml

@@ -50,10 +50,10 @@ jobs:
       - name: Install S1-Reader
         run: |
           curl -sSL \
-            https://github.com/opera-adt/s1-reader/archive/refs/tags/v0.2.2.tar.gz \
+            https://github.com/opera-adt/s1-reader/archive/refs/tags/v0.2.5.tar.gz \
             -o s1_reader_src.tar.gz \
           && tar -xvf s1_reader_src.tar.gz \
-          && ln -s s1-reader-0.2.2 s1-reader \
+          && ln -s s1-reader-0.2.5 s1-reader \
           && rm s1_reader_src.tar.gz \
           && python -m pip install ./s1-reader      
 

Docker/Dockerfile

@@ -1,8 +1,11 @@
-FROM oraclelinux:8
+ARG repository=cae-artifactory.jpl.nasa.gov:16003/gov/nasa/jpl/iems/sds/infrastructure/base/jplsds-oraclelinux
+ARG tag=8.10.250401
+ARG digest=sha256:e37c210f26cfe7660808e536937fcf6ac359b3ec5713211e46519d7a35973a57
+FROM ${repository}:${tag}@${digest}
 
 LABEL author="OPERA ADT" \
     description="RTC cal/val release R4" \
-    version="1.0.3-final"
+    version="1.0.4-final"
 
 RUN yum -y update &&\
     yum -y install curl &&\
@@ -37,9 +40,9 @@ SHELL ["conda", "run", "-n", "RTC", "/bin/bash", "-c"]
 WORKDIR /home/rtc_user/OPERA
 
 # installing OPERA s1-reader
-RUN curl -sSL https://github.com/isce-framework/s1-reader/archive/refs/tags/v0.2.4.tar.gz -o s1_reader_src.tar.gz &&\
+RUN curl -sSL https://github.com/isce-framework/s1-reader/archive/refs/tags/v0.2.5.tar.gz -o s1_reader_src.tar.gz &&\
     tar -xvf s1_reader_src.tar.gz &&\
-    ln -s s1-reader-0.2.4 s1-reader &&\
+    ln -s s1-reader-0.2.5 s1-reader &&\
     rm s1_reader_src.tar.gz &&\
     python -m pip install ./s1-reader
 

Docker/environment.yml

@@ -4,12 +4,12 @@ channels:
 dependencies:
   - python>=3.9,<3.10
   - gdal>=3.0
-  - s1reader>=0.2.4
+  - s1reader>=0.2.5
   - numpy>=1.20
   - pybind11>=2.5
   - pyre>=1.11.2
 
   - scipy!=1.10.0
-  - isce3==0.15.0
+  - isce3==0.24.4
   # Workaround for the issue with `libabseil` (09/11/2023)
   - libabseil=20230125.3

Docker/requirements.txt

@@ -1,4 +1,4 @@
-python>=3.9,<3.10
+python
 cmake>=3.18
 eigen>=3.3
 fftw>=3.3
@@ -21,4 +21,4 @@ setuptools
 shapely
 yamale
 backoff
-isce3==0.15.0
+isce3==0.24.3

build_docker_image.sh

@@ -2,7 +2,7 @@
 
 REPO=opera
 IMAGE=rtc
-TAG=final_1.0.3
+TAG=final_1.0.4
 
 echo "IMAGE is $REPO/$IMAGE:$TAG"
 

src/rtc/version.py

@@ -1 +1 @@
-VERSION='1.0.3'
+VERSION='1.0.4'