Fix jupyter 4.x (#115)

* rm accounts

* fix juypter 4.0 and up

form.yml

@@ -18,6 +18,8 @@ form:
   - bc_email_on_started
   - classroom
 attributes:
+  auto_modules_app_jupyter:
+    default: false
   mode:
     widget: "radio"
     value: "1"
@@ -34,13 +36,6 @@ attributes:
     min: 1
     max: 28
     step: 1
-  account:
-    label: "Project"
-    widget: select
-    options:
-      <%- groups.each do |group| %>
-      - "<%= group %>"
-      <%- end %>
   cuda_version:
     widget: "select"
     label: "CUDA Version"

template/before.sh.erb

@@ -43,7 +43,15 @@ if [[ ${WORKSPACE_FILE+x} ]]; then
   cp $WORKSPACE_FILE .
 fi
 
-JUPYTER_API="<%= context.mode == "1" ? "lab" : "tree" %>"
+<%-
+api = if context.auto_modules_app_jupyter.split('/')[1].to_s > '4.0' || context.mode == "1"
+        'lab'
+      else
+        'tree'
+      end
+-%>
+
+JUPYTER_API="<%= api %>"
 
 <%- if context.classroom == "1" -%>
 module purge

template/script.sh.erb

@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
 <%-
   require 'pathname'
+
+  subcommand =  if context.auto_modules_app_jupyter.split('/')[1].to_s > '4.0' || context.mode == "1"
+                  'lab'
+                else
+                  'notebook'
+                end
 -%>
 
 echo "Starting main script..."
@@ -38,4 +44,4 @@ echo "TTT - $(date)"
 
 # Launch the Jupyter server
 set -x
-jupyter <%= context.mode == "1" ? "lab" : "notebook" %> --config="${CONFIG_FILE}"
+jupyter <%= subcommand %> --config="${CONFIG_FILE}"