From c3e455bc020e87c6af844c05b437197e20b0dac4 Mon Sep 17 00:00:00 2001 From: Seongsu Jeong Date: Mon, 11 Sep 2023 11:22:29 -0700 Subject: [PATCH 1/2] skip installing s1reader fromsource code; s1reader version update --- .github/workflows/test.yml | 11 ----------- Docker/environment.yml | 4 +++- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ed5b91d4..60c08a2a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,17 +45,6 @@ jobs: with: environment-file: ${{ matrix.env-file.file }} environment-name: RTC - - # Install the S1-Reader OPERA-ADT project. - - name: Install S1-Reader - run: | - curl -sSL \ - https://github.com/opera-adt/s1-reader/archive/refs/tags/v0.1.7.tar.gz \ - -o s1_reader_src.tar.gz \ - && tar -xvf s1_reader_src.tar.gz \ - && ln -s s1-reader-0.1.7 s1-reader \ - && rm s1_reader_src.tar.gz \ - && python -m pip install ./s1-reader # Setup the project - name: Install Project diff --git a/Docker/environment.yml b/Docker/environment.yml index 63ad8551..7ee611da 100644 --- 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 \ No newline at end of file From 17f7638bcf7e024114378f24167b1f0c074b9e26 Mon Sep 17 00:00:00 2001 From: Seongsu Jeong Date: Mon, 11 Sep 2023 11:32:48 -0700 Subject: [PATCH 2/2] install s1reader from source code --- .github/workflows/test.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 60c08a2a..af3776a7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,7 +45,18 @@ jobs: with: environment-file: ${{ matrix.env-file.file }} environment-name: RTC - + + # Install the S1-Reader OPERA-ADT project. + - name: Install S1-Reader + run: | + curl -sSL \ + 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.2.2 s1-reader \ + && rm s1_reader_src.tar.gz \ + && python -m pip install ./s1-reader + # Setup the project - name: Install Project run: python -m pip install .