Fixes more jupyter versioning issues and switch back to main sotodlib branch

simonscryo · jlashner · commit 9515b4389a63 · 2021-05-11T11:02:49.000-07:00
diff --git a/Dockerfile b/Dockerfile
@@ -65,7 +65,7 @@ RUN mkdir build \
 #################################################################
 # SOTODLIB Install
 #################################################################
-RUN git clone --branch load_g3_file https://github.com/simonsobs/sotodlib.git
+RUN git clone https://github.com/simonsobs/sotodlib.git
 RUN pip3 install quaternionarray sqlalchemy
 RUN pip3 install ./sotodlib
 
@@ -91,6 +91,4 @@ WORKDIR /sodetlib
 
 RUN pip3 install -e .
 RUN pip3 install -r requirements.txt
-RUN pip3 install -U jupyterlab
-RUN pip3 install jedi==0.17.1
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,5 @@
 jupyterlab
-jedi==0.17.1
 tqdm
+setuptools >= 56.2.0
+ipykernel>=5.5.4
+jedi==0.17.1
