Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
wintel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
opentelemac
wintel
Commits
9abd027b
Commit
9abd027b
authored
3 years ago
by
Boris Basic
Browse files
Options
Downloads
Patches
Plain Diff
Replace Shapely with the version from Christoph Gohlke’s website
parent
d6725878
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build-telemac-deps.bat
+6
-2
6 additions, 2 deletions
build-telemac-deps.bat
requirements.txt
+1
-2
1 addition, 2 deletions
requirements.txt
with
7 additions
and
4 deletions
build-telemac-deps.bat
+
6
−
2
View file @
9abd027b
...
...
@@ -62,10 +62,12 @@ 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 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
-cp
37
-cp
37
m
-win
_amd64.whl
set
fiona
=
Fiona
-
1
.8.20
-cp
37
-cp
37
m
-win
_amd64.whl
set
rasterio
=
rasterio
-
1
.2.10
-cp
37
-cp
37
m
-win
_amd64.whl
set
shapely
=
Shapely
-
1
.8.0
-cp
37
-cp
37
m
-win
_amd64.whl
pushd
%~dp0
deps
...
...
@@ -292,14 +294,16 @@ rem Install all Python requirements for TELEMAC-MASCARET
echo
Installing
Python
requirements
...
pip
install
-r
%~dp0
requirements
.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
...
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
curl
-O -J
https
://download.lfd.uci.edu/pythonlibs/x6hvwk7i/
%shapely%
||
goto
install_error
pip
install
%gdal%
&&
del
%gdal%
pip
install
%fiona%
&&
del
%fiona%
pip
install
%rasterio%
&&
del
%rasterio%
pip
install
%shapely%
&&
del
%shapely%
pip
install
geopandas
popd
...
...
This diff is collapsed.
Click to expand it.
requirements.txt
+
1
−
2
View file @
9abd027b
...
...
@@ -16,7 +16,6 @@ matplotlib
pandas
alphashape
openpyxl
shapely
pylint
doxypypy
pyqt5
\ No newline at end of file
pyqt5
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment