Merge branch 'opera-adt:main' into changes_after_calval_point_release_7

opera-adt · Sep 11, 2023 · de74769 · de74769
2 parents e4b4d37 + 43aed55
commit de74769
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -50,13 +50,13 @@ jobs:
       - name: Install S1-Reader
         run: |
           curl -sSL \
-            https://github.com/opera-adt/s1-reader/archive/refs/tags/v0.1.7.tar.gz \
+            https://github.com/opera-adt/s1-reader/archive/refs/tags/v0.2.2.tar.gz \
             -o s1_reader_src.tar.gz \
           && tar -xvf s1_reader_src.tar.gz \
-          && ln -s s1-reader-0.1.7 s1-reader \
+          && ln -s s1-reader-0.2.2 s1-reader \
           && rm s1_reader_src.tar.gz \
-          && python -m pip install ./s1-reader
-      
+          && python -m pip install ./s1-reader      
+
       # Setup the project
       - name: Install Project
         run: python -m pip install .

diff --git a/Docker/environment.yml b/Docker/environment.yml
@@ -4,10 +4,12 @@ channels:
 dependencies:
   - python>=3.9,<3.10
   - gdal>=3.0
-  - s1reader>=0.2.1
+  - s1reader>=0.2.2
   - numpy>=1.20
   - pybind11>=2.5
   - pyre>=1.11.2
 
   - scipy!=1.10.0
   - isce3>=0.15.0
+  # Workaround for the issue with `libabseil` (09/11/2023)
+  - libabseil=20230125.3