From e3ff9edd392cddb32f57bb68384bb77f8cd7852e Mon Sep 17 00:00:00 2001
From: Zach McKenzie <92116279+zm711@users.noreply.github.com>
Date: Thu, 15 Jun 2023 08:29:38 -0400
Subject: [PATCH 1/3] add all conda dependencies, fix sklearn, and install from
 git

---
 environment.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/environment.yml b/environment.yml
index 67c530930..2f57c4986 100644
--- a/environment.yml
+++ b/environment.yml
@@ -1,4 +1,7 @@
 name: phy2
+channels:
+  - conda-forge
+  - defaults
 dependencies:
   - python=3.7
   - pip
@@ -7,9 +10,18 @@ dependencies:
   - scipy
   - h5py
   - pyqt
+  - pyopengl
+  - pyqtwebengine
+  - pytest
+  - qtconsole
+  - requests
+  - responses
+  - traitlets
   - dask
   - cython
   - pillow
-  - sklearn
+  - scikit-learn
+  - joblib
   - pip:
-    - phy
+    - git+https://github.com/cortex-lab/phy.git
+

From dff5c942188f01e3e61621bff2a6a28a8473deef Mon Sep 17 00:00:00 2001
From: Zach McKenzie <92116279+zm711@users.noreply.github.com>
Date: Thu, 15 Jun 2023 08:41:02 -0400
Subject: [PATCH 2/3] deleted python requirement

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 2f57c4986..2e2b15d7b 100644
--- a/environment.yml
+++ b/environment.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python=3.7
+  - python
   - pip
   - numpy
   - matplotlib

From 77e99e0ee0266ba0f38e2265e197bf5cb9932c7c Mon Sep 17 00:00:00 2001
From: Zach McKenzie <92116279+zm711@users.noreply.github.com>
Date: Thu, 15 Jun 2023 11:58:25 -0400
Subject: [PATCH 3/3] need to add git to make git work

---
 environment.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/environment.yml b/environment.yml
index 2e2b15d7b..55eac984c 100644
--- a/environment.yml
+++ b/environment.yml
@@ -5,6 +5,7 @@ channels:
 dependencies:
   - python
   - pip
+  - git
   - numpy
   - matplotlib
   - scipy