From 20833a64d6db9f1461e49db99d5e89f4bee13fd0 Mon Sep 17 00:00:00 2001 From: Boris Basic <boris.basic@edf.fr> Date: Tue, 22 Mar 2022 22:35:59 +0100 Subject: [PATCH] Update GDAL, Fiona and Shapely versions --- build-telemac-deps.bat | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build-telemac-deps.bat b/build-telemac-deps.bat index 5febe28..d1fb6ef 100644 --- a/build-telemac-deps.bat +++ b/build-telemac-deps.bat @@ -12,7 +12,7 @@ if "%~1" == "" ( exit /b 0 ) -rem Create it is it does not exist +rem Create it if it does not exist if not exist "%~1" ( mkdir "%~1" || exit /b 0 ) @@ -61,13 +61,13 @@ set mumps=mumps-5.4.1 set aed2=libaed2-1.3.0 set gotm=gotm-2019-06-14-opentelemac set python=python-3.7.9 -rem GDAL, Fiona and Rasterio Python cannot be installed using PyPI on Windows +rem GDAL, Fiona and Rasterio Python packages cannot be installed using PyPI on Windows rem Also, the version of Shapely that comes through pip is unstable rem Instead, we need to use unofficial wheels from Christoph Gohlke’s website -set gdal=GDAL-3.4.1-cp37-cp37m-win_amd64.whl -set fiona=Fiona-1.8.20-cp37-cp37m-win_amd64.whl +set gdal=GDAL-3.4.2-cp37-cp37m-win_amd64.whl +set fiona=Fiona-1.8.21-cp37-cp37m-win_amd64.whl set rasterio=rasterio-1.2.10-cp37-cp37m-win_amd64.whl -set shapely=Shapely-1.8.0-cp37-cp37m-win_amd64.whl +set shapely=Shapely-1.8.1.post1-cp37-cp37m-win_amd64.whl pushd %~dp0deps @@ -79,7 +79,7 @@ if %compiler% == intel ( goto intel_build ) -echo Unsupported compiler: %~1 +echo Unsupported compiler: %compiler% :exit popd @@ -295,7 +295,7 @@ echo Installing Python requirements... pip install -r %~dp0requirements.txt || goto install_error rem Download GDAL, Fiona, Rasterio and Shapely unofficial wheels, to avoid building them locally -echo Downloading GDAL, Fiona and Rasterio... +echo Downloading GDAL, Fiona, Rasterio and Shapely... curl -O -J https://download.lfd.uci.edu/pythonlibs/x6hvwk7i/%gdal% || goto install_error curl -O -J https://download.lfd.uci.edu/pythonlibs/x6hvwk7i/%fiona% || goto install_error curl -O -J https://download.lfd.uci.edu/pythonlibs/x6hvwk7i/%rasterio% || goto install_error -- GitLab