Skip to content

Commit 5ca0cab

Browse files
authored
tests: pin gdal"<=3.8" for circle ci (#1235)
+ circle ci: pin gdal"<=3.8" to fix the import error, which only occurrs in circle CI + tests/configs/SanFranBaySenD42: turn off tropo correction from pyaps + docs: use "HyP3" instead of "ASF HyP3"
1 parent 9a95b80 commit 5ca0cab

File tree

6 files changed

+11
-7
lines changed

6 files changed

+11
-7
lines changed

.circleci/config.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ jobs:
3333
command: |
3434
export PYTHONUNBUFFERED=1
3535
# install dependencies and source code
36-
# pin gdal version because gdal-3.9 could not read the GMT-6 *.grd file properly
37-
mamba install --verbose --yes --file ${MINTPY_HOME}/requirements.txt gdal"<3.9"
36+
# pin gdal version as "<=3.8" because:
37+
# 1) gdal-3.9 could not read the GMT-6 *.grd file properly
38+
# 2) gdal-3.9 could not be imported in circle CI (https://github.com/insarlab/MintPy/issues/1220)
39+
mamba install --verbose --yes --file ${MINTPY_HOME}/requirements.txt gdal"<=3.8"
3840
python -m pip install ${MINTPY_HOME}
3941
# test installation
4042
smallbaselineApp.py -h
@@ -62,7 +64,7 @@ jobs:
6264
${MINTPY_HOME}/tests/smallbaselineApp.py --dir ${HOME}/data --dset SanFranSenDT42
6365
6466
- run:
65-
name: Integration Test 3 - RidgecrestSenDT71 (ASF HyP3)
67+
name: Integration Test 3 - RidgecrestSenDT71 (HyP3)
6668
command: |
6769
mkdir -p ${HOME}/data
6870
${MINTPY_HOME}/tests/smallbaselineApp.py --dir ${HOME}/data --dset RidgecrestSenDT71

docs/demo_dataset.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Relevant literature:
4242

4343
+ Chaussard, E., R. Bürgmann, H. Fattahi, R. M. Nadeau, T. Taira, C. W. Johnson, and I. Johanson (2015), Potential for larger earthquakes in the East San Francisco Bay Area due to the direct connection between the Hayward and Calaveras Faults, _Geophysical Research Letters,_ 42(8), 2734-2741, doi:10.1002/2015GL063575.
4444

45-
### Sentinel-1 of the 2019 Ridgecrest, California earthquake sequence with ASF HyP3 ###
45+
### Sentinel-1 of the 2019 Ridgecrest, California earthquake sequence with HyP3 ###
4646

4747
+ Area: Owens Valley, California, USA ([USGS event page](https://earthquake.usgs.gov/earthquakes/eventpage/ci38457511/executive))
4848
+ Data: Sentinel-1 descending track 71 during June - August 2019 (7 acquisitions; [Zenodo](https://zenodo.org/record/11049257))

docs/dir_structure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ mintpy.load.azAngleFile = $DATA_DIR/SanFranSenDT42/azimuthAngle/*.vrt
378378
mintpy.load.waterMaskFile = $DATA_DIR/SanFranSenDT42/mask/watermask.msk
379379
```
380380

381-
### [ASF HyP3](https://hyp3-docs.asf.alaska.edu/)
381+
### [HyP3](https://hyp3-docs.asf.alaska.edu/)
382382

383383
1. Search, request and download interferograms using [hyp3_sdk](https://nbviewer.jupyter.org/github/ASFHyP3/hyp3-sdk/blob/main/docs/sdk_example.ipynb) or the [ASF Vertex website](https://search.asf.alaska.edu/) following the [story map](https://storymaps.arcgis.com/stories/68a8a3253900411185ae9eb6bb5283d3).
384384
+ For at least one interferogram, download the accompanying DEM.

docs/installation.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ or install dependencies into an existing environment:
9191
# Add "isce2" below to install extra dependencies if you use ISCE-2
9292
# Add "gdal" below to install extra dependencies if you use ARIA, FRInGE or HyP3
9393
# Add "gdal'<3.9'" below to install extra dependencies if you use GMTSAR
94-
mamba update --name my-existing-env --file ~/tools/MintPy/requirements.txt
94+
mamba activate my-existing-env
95+
mamba install --file ~/tools/MintPy/requirements.txt
9596
```
9697

9798
<h4>c. Install MintPy</h4>

tests/configs/SanFranBaySenD42.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ mintpy.load.waterMaskFile = ../geometry/water_mask.grd
2222

2323
mintpy.reference.lalo = 37.69, -122.07
2424
mintpy.networkInversion.weightFunc = no # fast but not the best
25+
mintpy.troposphericDelay.method = no
2526
mintpy.deramp = no
2627
mintpy.topographicResidual = yes
2728
mintpy.topographicResidual.pixelwiseGeometry = no # fast but not the best

tests/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
gdal<3.9 # for ISCE-2/3, ARIA, FRInGE, HyP3, GMTSAR users, gdal-3.9 could not read GMT *.grd file's coordinate info properly
1+
gdal<=3.8 # for ISCE-2/3, ARIA, FRInGE, HyP3, GMTSAR users; gdal-3.9 could not read GMT *.grd file's coordinate info properly [for GMTSAR]
22
isce2 # for ISCE-2 users
33
pre-commit # for developers
44
pyfftw

0 commit comments

Comments
 (0)