Skip to content
This repository was archived by the owner on Mar 17, 2023. It is now read-only.

Commit 4f844d3

Browse files
authored
Merge pull request #94 from vpavlin/feature/update-jsp-0.4.0
Update JSP to 0.4.1
2 parents cc55c2e + 7831c5d commit 4f844d3

4 files changed

Lines changed: 285 additions & 224 deletions

File tree

.jupyter/jupyterhub_config.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,8 @@ def options_from_form(self, formdata):
247247
def apply_pod_profile(spawner, pod):
248248
spawner.single_user_profiles.load_profiles(username=spawner.user.name)
249249
profile = spawner.single_user_profiles.get_merged_profile(spawner.image, user=spawner.user.name, size=spawner.deployment_size)
250-
return SingleuserProfiles.apply_pod_profile(spawner.user.name, pod, profile, DEFAULT_MOUNT_PATH, spawner.gpu_mode)
250+
gpu_types = spawner.single_user_profiles.get_gpu_types()
251+
return SingleuserProfiles.apply_pod_profile(spawner.user.name, pod, profile, gpu_types, DEFAULT_MOUNT_PATH, spawner.gpu_mode)
251252

252253
def setup_environment(spawner):
253254
spawner.single_user_profiles.load_profiles(username=spawner.user.name)

.s2i/bin/assemble

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,5 @@ cp -a ${JSP_UI_SRC_PATH}/build/. /opt/app-root/share/jupyterhub/static/jsp-ui
2424

2525
cd ${JSP_UI_SRC_PATH}/templates/
2626
yes | cp -rf spawn.html /opt/app-root/share/jupyterhub/templates/
27-
cd ${JSP_UI_SRC_PATH}/styles/
28-
yes | cp -rf style.less /opt/app-root/share/jupyterhub/static/less
2927

3028
fix-permissions /opt/app-root

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ verify_ssl = true
77

88
[packages]
99
openshift = "==0.11.2"
10-
jupyterhub-singleuser-profiles = "==0.3.1"
10+
jupyterhub-singleuser-profiles = "==0.4.1"
1111
publish-service = {ref = "7cbf34e494fd9a0a79e9cd9a8c1d48a6775b9f49",git = "https://github.com/vpavlin/jupyter-publish-extension.git", editable = true}
1212
oauthenticator = {ref = "2bf137c35e4eddac0a586ac054098ff74c30c779",git = "https://github.com/opendatahub-io/oauthenticator.git", editable = true}
1313

0 commit comments

Comments
 (0)