From 5f18a3d0e72aadac71448517e24669cfae778d29 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Tue, 17 Aug 2021 22:48:50 +0530
Subject: [PATCH] eecs: Move more package installs to conda

I give up trying to get pip work with cvxpy and openblas
---
 deployments/eecs/image/environment.yml  | 11 +++++++++++
 deployments/eecs/image/requirements.txt | 12 +-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/deployments/eecs/image/environment.yml b/deployments/eecs/image/environment.yml
index 61411ea7c..2c552f794 100644
--- a/deployments/eecs/image/environment.yml
+++ b/deployments/eecs/image/environment.yml
@@ -22,6 +22,17 @@ dependencies:
 - libopenblas==0.3.17
 - liblapack==3.9.0
 - armadillo==9.900.5
+# CS 16A
+# From https://github.com/berkeley-dsep-infra/datahub/issues/1363#issuecomment-598916469
+- numpy==1.21.2
+- matplotlib==3.4.3
+- sympy==1.8
+
+# For EECS127/227a
+# See https://github.com/berkeley-dsep-infra/datahub/issues/1631
+- cvxpy==1.1.15
+# See https://github.com/berkeley-dsep-infra/datahub/issues/1936
+- scikit-learn==0.24.2
 
 - pip
 - pip:
diff --git a/deployments/eecs/image/requirements.txt b/deployments/eecs/image/requirements.txt
index 56ae6cb43..de6286a0b 100644
--- a/deployments/eecs/image/requirements.txt
+++ b/deployments/eecs/image/requirements.txt
@@ -1,10 +1,6 @@
 -r infra-requirements.txt
 
-# CS 16A
 # From https://github.com/berkeley-dsep-infra/datahub/issues/1363#issuecomment-598916469
-numpy==1.21.2
-matplotlib==3.4.3
-sympy==1.8
 lcapy==0.96
 # From https://github.com/berkeley-dsep-infra/datahub/issues/1505
 Pillow==8.3.1
@@ -13,10 +9,4 @@ PyQt5==5.15.4
 opencv-python==4.5.3.56
 
 # For desktop environment
-jupyter-desktop-server==0.1.3
-
-# For EECS127/227a
-# See https://github.com/berkeley-dsep-infra/datahub/issues/1631
-cvxpy==1.1.15
-# See https://github.com/berkeley-dsep-infra/datahub/issues/1936
-scikit-learn==0.24.2
+jupyter-desktop-server==0.1.3
\ No newline at end of file