Merge pull request #535 from ooicloud/staging

Remove packages not compatible with GMT=6
pangeo-data · Feb 10, 2020 · 6cd2486 · 6cd2486
2 parents c28fe64 + 2c9911c
commit 6cd2486
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/deployments/ooi/image/binder/Dockerfile b/deployments/ooi/image/binder/Dockerfile
@@ -2,7 +2,7 @@
 FROM pangeo/base-notebook-onbuild:2019.12.21
 
 # update conda
-RUN conda update -n root conda
+#RUN conda update -n root conda
 
 # Add NB_USER to sudo
 #USER root

diff --git a/deployments/ooi/image/binder/environment.yml b/deployments/ooi/image/binder/environment.yml
@@ -16,8 +16,8 @@ dependencies:
   - sympy
   # data science stuff
   - scikit-image
-  #- scikit-learn
-  #- dask-ml
+  - scikit-learn
+  - dask-ml
   #- tensorflow
   #- keras
   #- pytorch-cpu
@@ -86,7 +86,7 @@ dependencies:
   - xrviz
   - climpred
   - pytide
-  - pyinterp
+  #- pyinterp # *** This apparently causes the GMT segmentation fault ***
   # misc
   - python-wget
   - prefect
@@ -95,6 +95,6 @@ dependencies:
     - azure
     - git+https://github.com/ooicloud/ooi-opendata.git@bad61bf649ae5b189ff14fae06b567b25a8b2e47
     - git+https://github.com/GenericMappingTools/pygmt
-    #- intake_geopandas
-    #- git+https://github.com/NCAR/intake-esm.git@master
-    #- git+https://github.com/hhuangwx/cmaps.git#egg=cmaps
+    - intake_geopandas
+    - git+https://github.com/NCAR/intake-esm.git@master
+    - git+https://github.com/hhuangwx/cmaps.git#egg=cmaps