fix GDAL install in actions

mayrajeo · Sep 19, 2023 · 8ad34cd · 8ad34cd
1 parent e1a3339
commit 8ad34cd
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/.github/actions/nbdev-ci/action.yml b/.github/actions/nbdev-ci/action.yml
@@ -43,8 +43,8 @@ runs:
         sudo apt-add-repository ppa:ubuntugis/ubuntugis-unstable
         sudo apt-get update
         sudo apt-get install gdal-bin libgdal-dev
-        gdal-config --version
         python -m pip install --upgrade pip
+        pip install GDAL==$(gdal-config --version)
         if [ $USE_PRE ]; then
           pip install -U git+https://github.com/fastai/fastcore.git
           pip install -U git+https://github.com/fastai/ghapi.git

diff --git a/.github/actions/quarto-ghp/action.yml b/.github/actions/quarto-ghp/action.yml
@@ -38,6 +38,7 @@ runs:
         sudo apt-get update
         sudo apt-get install gdal-bin libgdal-dev
         python -m pip install --upgrade pip
+        pip install GDAL==$(gdal-config --version)
         if [ $USE_PRE ]; then
           pip install -Uq git+https://github.com/fastai/ghapi.git
           pip install -Uq git+https://github.com/fastai/fastcore.git

diff --git a/nbs/example_data/R70C21.dbf b/nbs/example_data/R70C21.dbf
diff --git a/nbs/example_data/tiles/coco_norm.json b/nbs/example_data/tiles/coco_norm.json
diff --git a/nbs/example_data/tiles/coco_rot.json b/nbs/example_data/tiles/coco_rot.json
diff --git a/settings.ini b/settings.ini
@@ -38,7 +38,7 @@ status = 3
 user = mayrajeo
 
 ### Optional ###
-requirements = fastcore numpy geopandas rasterio pycocotools scikit-image scikit-learn tqdm matplotlib GDAL==3.6.4 rasterstats black
+requirements = fastcore numpy geopandas rasterio pycocotools scikit-image scikit-learn tqdm matplotlib GDAL rasterstats black
 # dev_requirements = 
 console_scripts = 
     geo2ml_help=geo2ml.cli:chelp