Merge branch 'master' into update_dynamic_spinup

OGGM · Aug 14, 2023 · 5dc5eb6 · 5dc5eb6
2 parents 0a47797 + 192aa16
commit 5dc5eb6
Show file tree

Hide file tree

Showing 4 changed files with 397 additions and 2 deletions.
diff --git a/_toc.yml b/_toc.yml
@@ -18,6 +18,7 @@ parts:
     - file: notebooks/beginner/working_with_rgi
     - file: notebooks/beginner/store_and_compress_glacierdirs
     - file: notebooks/beginner/plot_mass_balance
+    - file: notebooks/beginner/distribute_flowline
     - file: notebooks/beginner/deal_with_errors
     - file: notebooks/beginner/inversion
     - file: notebooks/beginner/hydrological_output

diff --git a/binder/environment.yml b/binder/environment.yml
@@ -19,7 +19,9 @@ dependencies:
   - dask
   - bottleneck
   - pyproj
-  - cartopy
+  - geos
+  - shapely
+  - pyshp
   - geopandas
   - rioxarray
   - seaborn
@@ -36,3 +38,4 @@ dependencies:
     - progressbar2
     - git+https://github.com/OGGM/oggm-edu
     - oggm
+    - cartopy