From d78e0b46cde7aed5a688a081a0a18c521626e652 Mon Sep 17 00:00:00 2001
From: dafeliton <dafeliton@ucsd.edu>
Date: Mon, 26 Feb 2024 20:09:06 -0800
Subject: [PATCH] Switch datascience to jupyter/scipy, as now their datascience
 includes tf/pytorch...

---
 .github/workflows/main.yml             | 4 ++--
 images/datascience-notebook/Dockerfile | 5 ++++-
 images/spec.yml                        | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cecfeae8..f2d9252b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -83,8 +83,8 @@ jobs:
 
       - name: Install pip dependencies
         run: |
-          sudo yum -y install python-pip
-          sudo yum remove python3-requests -y
+          sudo dnf -y install python-pip
+          sudo dnf remove python3-requests -y
           python3 -m pip install -r scripts/requirements.txt
       
       - name: Install selenium dependecies for r studio
diff --git a/images/datascience-notebook/Dockerfile b/images/datascience-notebook/Dockerfile
index 0e6f4c52..53ce540e 100644
--- a/images/datascience-notebook/Dockerfile
+++ b/images/datascience-notebook/Dockerfile
@@ -1,5 +1,5 @@
 ARG PYTHON_VERSION=python-3.11.8
-FROM quay.io/jupyter/datascience-notebook:$PYTHON_VERSION
+FROM quay.io/jupyter/scipy-notebook:$PYTHON_VERSION
 # coerce change in all notebooks
 USER root
 
@@ -51,6 +51,9 @@ USER jovyan
 ARG PY_VER_SHORT=3.11
 ARG JUPYTERHUB_VERSION=3.0.0
 
+# Add additional pip packages
+RUN pip install nbgrader nbgitpuller nbresuse pillow typing-extensions tzlocal appdirs GPUtil mock pytest
+
 # mistune added for nbgrader issues
 
 # jupyterlab_rise must be below 0.40.0 while jupyterlab is not > v4.0.0
diff --git a/images/spec.yml b/images/spec.yml
index 8c76ecd0..341a42c4 100644
--- a/images/spec.yml
+++ b/images/spec.yml
@@ -6,7 +6,7 @@ images:
     build_args:
       PYTHON_VERSION: python-3.11.8
       PY_VER_SHORT: "3.11"
-      JUPYTERHUB_VERSION: 1.4.1
+      JUPYTERHUB_VERSION: 3.0.0
     info_cmds: [PY_VER, PIP_LIST, CONDA_INFO, CONDA_LIST, APT_PKG_LIST]
 
   rstudio-notebook: