Skip to content
Snippets Groups Projects
Commit 9abd027b authored by Boris Basic's avatar Boris Basic
Browse files

Replace Shapely with the version from Christoph Gohlke’s website

parent d6725878
Branches v1
No related tags found
No related merge requests found
...@@ -62,10 +62,12 @@ set aed2=libaed2-1.3.0 ...@@ -62,10 +62,12 @@ set aed2=libaed2-1.3.0
set gotm=gotm-2019-06-14-opentelemac set gotm=gotm-2019-06-14-opentelemac
set python=python-3.7.9 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 cannot be installed using PyPI on Windows
rem We need to download unofficial wheels from Christoph Gohlke’s website 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 gdal=GDAL-3.4.1-cp37-cp37m-win_amd64.whl
set fiona=Fiona-1.8.20-cp37-cp37m-win_amd64.whl set fiona=Fiona-1.8.20-cp37-cp37m-win_amd64.whl
set rasterio=rasterio-1.2.10-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
pushd %~dp0deps pushd %~dp0deps
...@@ -292,14 +294,16 @@ rem Install all Python requirements for TELEMAC-MASCARET ...@@ -292,14 +294,16 @@ rem Install all Python requirements for TELEMAC-MASCARET
echo Installing Python requirements... echo Installing Python requirements...
pip install -r %~dp0requirements.txt || goto install_error pip install -r %~dp0requirements.txt || goto install_error
rem Download GDAL, Fiona and Rasterio unofficial wheels, to avoid building them locally rem Download GDAL, Fiona, Rasterio and Shapely unofficial wheels, to avoid building them locally
echo Downloading GDAL, Fiona and Rasterio... echo Downloading GDAL, Fiona and Rasterio...
curl -O -J https://download.lfd.uci.edu/pythonlibs/x6hvwk7i/%gdal% || goto install_error 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/%fiona% || goto install_error
curl -O -J https://download.lfd.uci.edu/pythonlibs/x6hvwk7i/%rasterio% || goto install_error curl -O -J https://download.lfd.uci.edu/pythonlibs/x6hvwk7i/%rasterio% || goto install_error
curl -O -J https://download.lfd.uci.edu/pythonlibs/x6hvwk7i/%shapely% || goto install_error
pip install %gdal% && del %gdal% pip install %gdal% && del %gdal%
pip install %fiona% && del %fiona% pip install %fiona% && del %fiona%
pip install %rasterio% && del %rasterio% pip install %rasterio% && del %rasterio%
pip install %shapely% && del %shapely%
pip install geopandas pip install geopandas
popd popd
......
...@@ -16,7 +16,6 @@ matplotlib ...@@ -16,7 +16,6 @@ matplotlib
pandas pandas
alphashape alphashape
openpyxl openpyxl
shapely
pylint pylint
doxypypy doxypypy
pyqt5 pyqt5
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment