Merge pull request #205 from johrstrom/ood-update-jupyter

update jupyter in the OOD demo

Author: aebruno

ondemand/README.md

@@ -631,7 +631,7 @@ why it's not directly in the shell scripts `PATH`.
 We need to add this line to our job's shell script to enable it.
 
 ```shell
-source /usr/local/jupyter/2.1.4/bin/activate
+source /usr/local/jupyter/4.3.5/bin/activate
 ```
 
 So let's [open the template/script.sh.erb in the file editor](https://localhost:3443/pun/sys/file-editor/edit/home/hpcadmin/ondemand/dev/jupyter/template/script.sh.erb)
@@ -643,7 +643,7 @@ Lines 24 - 31 of `template/script.sh.erb` should now look like this.
 # Benchmark info
 echo "TIMING - Starting jupyter at: $(date)"
 
-source /usr/local/jupyter/2.1.4/bin/activate
+source /usr/local/jupyter/4.3.5/bin/activate
 
 # Launch the Jupyter Notebook Server
 set -x
@@ -1109,7 +1109,7 @@ cd "${HOME}"
 # Benchmark info
 echo "TIMING - Starting jupyter at: $(date)"
 
-source /usr/local/jupyter/2.1.4/bin/activate
+source /usr/local/jupyter/4.3.5/bin/activate
 
 # Launch the Jupyter Notebook Server
 set -x

ondemand/jupyter/template/script.sh.erb

@@ -10,11 +10,11 @@ cd "${HOME}"
 # Start Jupyter Notebook Server
 #
 
-source /usr/local/jupyter/2.1.4/bin/activate
+source /usr/local/jupyter/4.3.5/bin/activate
 
 # Benchmark info
 echo "TIMING - Starting jupyter at: $(date)"
 
 # Launch the Jupyter Notebook Server
 set -x
-jupyter notebook --config="${CONFIG_FILE}" <%= context.extra_jupyter_args %>
+jupyter lab --config="${CONFIG_FILE}" <%= context.extra_jupyter_args %>

slurm/install.sh

@@ -109,10 +109,12 @@ echo -e "# Disable Avahi (since it does not run inside the containers)\n-A" >> /
 log_info "Configuring PCP logger with suitable container defaults.."
 sed -i 's#^LOCALHOSTNAME.*$#LOCALHOSTNAME   y   n   "/home/pcp/$(date +%Y)/$(date +%m)/LOCALHOSTNAME/$(date +%Y)-$(date +%m)-$(date +%d)"   -r -c /etc/pcp/pmlogger/pmlogger-supremm.config#' /etc/pcp/pmlogger/control.d/local
 
+export JUPYTER_VERSION=4.3.5
+
 log_info "Installing Jupyter.."
-python3 -m venv /usr/local/jupyter/2.1.4 --prompt jupyter/2.1.4
-source /usr/local/jupyter/2.1.4/bin/activate
-pip install jupyterlab==2.1.4 jupyter-console qtconsole ipywidgets plotly==4.8.2 pandas scikit-learn numpy
+python3 -m venv /usr/local/jupyter/$JUPYTER_VERSION --prompt jupyter/$JUPYTER_VERSION
+source /usr/local/jupyter/$JUPYTER_VERSION/bin/activate
+pip install jupyterlab==$JUPYTER_VERSION jupyter-console qtconsole ipywidgets plotly pandas scikit-learn numpy
 deactivate
 
 dnf clean all