Update JSP to 0.4.1

opendatahub-io-contrib · May 27, 2021 · 7831c5d · 7831c5d
1 parent cc55c2e
commit 7831c5d
Show file tree

Hide file tree

Showing 4 changed files with 285 additions and 224 deletions.
diff --git a/.jupyter/jupyterhub_config.py b/.jupyter/jupyterhub_config.py
@@ -247,7 +247,8 @@ def options_from_form(self, formdata):
 def apply_pod_profile(spawner, pod):
   spawner.single_user_profiles.load_profiles(username=spawner.user.name)
   profile = spawner.single_user_profiles.get_merged_profile(spawner.image, user=spawner.user.name, size=spawner.deployment_size)
-  return SingleuserProfiles.apply_pod_profile(spawner.user.name, pod, profile, DEFAULT_MOUNT_PATH, spawner.gpu_mode)
+  gpu_types = spawner.single_user_profiles.get_gpu_types()
+  return SingleuserProfiles.apply_pod_profile(spawner.user.name, pod, profile, gpu_types, DEFAULT_MOUNT_PATH, spawner.gpu_mode)
 
 def setup_environment(spawner):
     spawner.single_user_profiles.load_profiles(username=spawner.user.name)

diff --git a/.s2i/bin/assemble b/.s2i/bin/assemble
@@ -24,7 +24,5 @@ cp -a ${JSP_UI_SRC_PATH}/build/. /opt/app-root/share/jupyterhub/static/jsp-ui
 
 cd ${JSP_UI_SRC_PATH}/templates/
 yes | cp -rf spawn.html /opt/app-root/share/jupyterhub/templates/
-cd ${JSP_UI_SRC_PATH}/styles/
-yes | cp -rf style.less /opt/app-root/share/jupyterhub/static/less
 
 fix-permissions /opt/app-root
diff --git a/Pipfile b/Pipfile
@@ -7,7 +7,7 @@ verify_ssl = true
 
 [packages]
 openshift = "==0.11.2"
-jupyterhub-singleuser-profiles = "==0.3.1"
+jupyterhub-singleuser-profiles = "==0.4.1"
 publish-service = {ref = "7cbf34e494fd9a0a79e9cd9a8c1d48a6775b9f49",git = "https://github.com/vpavlin/jupyter-publish-extension.git", editable = true}
 oauthenticator = {ref = "2bf137c35e4eddac0a586ac054098ff74c30c779",git = "https://github.com/opendatahub-io/oauthenticator.git", editable = true}