Move some packages back to pip

These were causing conflicts conda couldn't solve, and there is no reason to move these right now.
yuvipanda · Oct 27, 2021 · 21dfc30 · 21dfc30
1 parent 011f1fb
commit 21dfc30
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/deployments/datahub/images/default/environment.yml b/deployments/datahub/images/default/environment.yml
@@ -22,23 +22,11 @@ dependencies:
 - spacy=3.1.*
 - nltk=3.6.*
 
-# data-x; DL
-- tensorflow=2.6.*
-- scikit-image=0.18.*
-
 # EPS88, data100
 # https://github.com/berkeley-dsep-infra/datahub/issues/1796
 # https://github.com/berkeley-dsep-infra/datahub/issues/2824
 - shapely=1.8.*
 - cartopy=0.20.*
-# data100, geog88
-# https://github.com/berkeley-dsep-infra/datahub/issues/2838
-- geopandas=0.10.*
-- geopy=2.2.*
-- pysal=2.5.*
-- rtree=0.9.*
-- netcdf4=1.5.*
-- mplleaflet=0.0.5
 
 # ls 88-3; neuro
 - pillow=8.3.*
diff --git a/deployments/datahub/images/default/requirements.txt b/deployments/datahub/images/default/requirements.txt
@@ -29,6 +29,14 @@ numexpr==2.7.3
 openpyxl==3.0.7
 nilearn==0.8.0
 
+# data100, geog88
+# https://github.com/berkeley-dsep-infra/datahub/issues/2838
+geopandas==0.10.*
+geopy==2.2.*
+pysal==2.5.*
+rtree==0.9.*
+netcdf4==1.5.*
+mplleaflet==0.0.5
 # phys 151;
 emcee==3.1.0
 daft==0.1.2
@@ -38,6 +46,8 @@ corner==2.2.1
 pymdptoolbox==4.0-b3
 #
 # data-x; DL
+tensorflow==2.6.*
+scikit-image==0.18.*
 tables==3.6.1
 opencv-python==4.5.3.56