From 50e52baaf6fae25b142749359fc35a38437963b5 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Fri, 13 Oct 2023 22:46:36 +0530 Subject: [PATCH 01/37] install jhub-apps in jupyterhub image --- jupyterhub/environment.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 595c826..abd215f 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -14,3 +14,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 + - git+https://github.com/nebari-dev/jhub-apps.git@1cde22f4928755c1b467b2d8dac7b60ba0c6141e From 123efcaeb459e59f5bc3d3f4b98f01d44321566c Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Fri, 13 Oct 2023 22:52:27 +0530 Subject: [PATCH 02/37] update environment to use jhub apps and push --- .github/workflows/build-push-docker.yaml | 2 +- jupyterhub/environment.yaml | 4 ++++ jupyterlab/environment.yaml | 13 +++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-push-docker.yaml b/.github/workflows/build-push-docker.yaml index ac8bcc4..809795d 100644 --- a/.github/workflows/build-push-docker.yaml +++ b/.github/workflows/build-push-docker.yaml @@ -7,7 +7,7 @@ on: workflow_dispatch: null push: branches: - - main + - "*" paths: - "Dockerfile.*" diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index abd215f..41d309a 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -11,6 +11,10 @@ dependencies: - kubernetes_asyncio - jupyterhub-idle-culler==1.2.1 - sqlalchemy==1.4.46 + # JHub Apps dependencies + - flask + - panel + - bokeh - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 83fb889..4a5c410 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -52,6 +52,17 @@ dependencies: - importnb - git-lfs + # JHub Apps dependencies + - flask + - plotlydash-tornado-cmd + - bokeh-root-cmd + - jhsingle-native-proxy + - panel + - voila + - dash + - streamlit + - traitlets + - pip: # vscode jupyterlab launcher - git+https://github.com/betatim/vscode-binder @@ -59,3 +70,5 @@ dependencies: - jupyter-tensorboard - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 + - gradio + - git+https://github.com/nebari-dev/jhub-apps.git@1cde22f4928755c1b467b2d8dac7b60ba0c6141e From 8e257ae790feec70917489482cf22e0fec791775 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 16 Oct 2023 23:59:20 +0530 Subject: [PATCH 03/37] bump jhub-apps commit hash --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 41d309a..0c2962a 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@1cde22f4928755c1b467b2d8dac7b60ba0c6141e + - git+https://github.com/nebari-dev/jhub-apps.git@f32aab3148c5e352afc8d2e7c5acdb9f806ea8bd diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 4a5c410..52510ce 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@1cde22f4928755c1b467b2d8dac7b60ba0c6141e + - git+https://github.com/nebari-dev/jhub-apps.git@f32aab3148c5e352afc8d2e7c5acdb9f806ea8bd From 77347ed047fe893cb0081aa5d55f22326cd644cf Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Tue, 17 Oct 2023 00:41:26 +0530 Subject: [PATCH 04/37] bump jhub to 4.0.2 --- jupyterhub/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 0c2962a..b7d7aea 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: - pip==21.1.2 - - jupyterhub==3.1.1 + - jupyterhub==4.0.2 - jupyterhub-kubespawner==4.2.0 - oauthenticator==15.1.0 - escapism==1.0.1 From 9fcf271ebc2bccdaf44aeb648985b18744aa63ec Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Tue, 17 Oct 2023 10:17:03 +0530 Subject: [PATCH 05/37] bump jhub apps version to a3706b9 --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index b7d7aea..7506e8a 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@f32aab3148c5e352afc8d2e7c5acdb9f806ea8bd + - git+https://github.com/nebari-dev/jhub-apps.git@a3706b9b7509a1651a38fa835a2763631741a3c1 diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 52510ce..a02c908 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@f32aab3148c5e352afc8d2e7c5acdb9f806ea8bd + - git+https://github.com/nebari-dev/jhub-apps.git@a3706b9b7509a1651a38fa835a2763631741a3c1 From 5937a801fc434d400836b3f634677daa7e228ae1 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Thu, 19 Oct 2023 17:12:47 +0530 Subject: [PATCH 06/37] update japps --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 7506e8a..007d771 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@a3706b9b7509a1651a38fa835a2763631741a3c1 + - git+https://github.com/nebari-dev/jhub-apps.git@ecc71fe842eb7595c04843f31fb2f7949d10b3e4 diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index a02c908..b5d9d0b 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@a3706b9b7509a1651a38fa835a2763631741a3c1 + - git+https://github.com/nebari-dev/jhub-apps.git@ecc71fe842eb7595c04843f31fb2f7949d10b3e4 From b974a57ee47a761342ef92007503051d03cf487f Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Thu, 19 Oct 2023 17:51:42 +0530 Subject: [PATCH 07/37] update japps again --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 007d771..5802998 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@ecc71fe842eb7595c04843f31fb2f7949d10b3e4 + - git+https://github.com/nebari-dev/jhub-apps.git@7a2baeb4f0f9eb437104d1abca6ea4b7f1d27fe9 diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index b5d9d0b..47c0d8e 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@ecc71fe842eb7595c04843f31fb2f7949d10b3e4 + - git+https://github.com/nebari-dev/jhub-apps.git@7a2baeb4f0f9eb437104d1abca6ea4b7f1d27fe9 From 0b899067bee3c65358fa27b92b322a120906f574 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Thu, 19 Oct 2023 20:10:26 +0530 Subject: [PATCH 08/37] update to hub --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 5802998..9f71dd8 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@7a2baeb4f0f9eb437104d1abca6ea4b7f1d27fe9 + - git+https://github.com/nebari-dev/jhub-apps.git@2fae6a79b94ac7e5675e09ed4a3f093af480e1a1 diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 47c0d8e..60b8eba 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@7a2baeb4f0f9eb437104d1abca6ea4b7f1d27fe9 + - git+https://github.com/nebari-dev/jhub-apps.git@2fae6a79b94ac7e5675e09ed4a3f093af480e1a1 From 2100b1b5278e63d08a406562b3d6a99cc6ae3d3f Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Thu, 19 Oct 2023 22:12:46 +0530 Subject: [PATCH 09/37] build docker image --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 9f71dd8..0f5648e 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@2fae6a79b94ac7e5675e09ed4a3f093af480e1a1 + - git+https://github.com/nebari-dev/jhub-apps.git@6a08ae1fb5015b7973451e3099377698d8c31e12 diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 60b8eba..b88df5d 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@2fae6a79b94ac7e5675e09ed4a3f093af480e1a1 + - git+https://github.com/nebari-dev/jhub-apps.git@6a08ae1fb5015b7973451e3099377698d8c31e12 From 3429d49de85a3b9ad03b86509df3017f7a9aa80b Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Thu, 19 Oct 2023 23:50:40 +0530 Subject: [PATCH 10/37] update jhub to 3fc6729 --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 0f5648e..a5ce683 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@6a08ae1fb5015b7973451e3099377698d8c31e12 + - git+https://github.com/nebari-dev/jhub-apps.git@3fc6729ac97b329d0f995f3770982cf3a4f39884 diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index b88df5d..300d9a8 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@6a08ae1fb5015b7973451e3099377698d8c31e12 + - git+https://github.com/nebari-dev/jhub-apps.git@3fc6729ac97b329d0f995f3770982cf3a4f39884 From f335fc5bb8db411a888ccb9d8bffb84955f32a3c Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Fri, 3 Nov 2023 16:12:53 +0530 Subject: [PATCH 11/37] update image - get conf from file --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index a5ce683..37c50f0 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@3fc6729ac97b329d0f995f3770982cf3a4f39884 + - git+https://github.com/nebari-dev/jhub-apps.git@2d1e4ac8974c24df1a2eb50f7ce00ecb5435eaa3 diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 300d9a8..36af541 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@3fc6729ac97b329d0f995f3770982cf3a4f39884 + - git+https://github.com/nebari-dev/jhub-apps.git@2d1e4ac8974c24df1a2eb50f7ce00ecb5435eaa3 From 4616652655141c50727cf8a351adf3d629f7e4ee Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Fri, 3 Nov 2023 17:22:23 +0530 Subject: [PATCH 12/37] update japps --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 37c50f0..dee830e 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@2d1e4ac8974c24df1a2eb50f7ce00ecb5435eaa3 + - git+https://github.com/nebari-dev/jhub-apps.git@ebe6ba1d3e0d123d732a62bd2305b943f824a522 diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 36af541..1484d42 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@2d1e4ac8974c24df1a2eb50f7ce00ecb5435eaa3 + - git+https://github.com/nebari-dev/jhub-apps.git@ebe6ba1d3e0d123d732a62bd2305b943f824a522 From 3414f1549dd3e01cb5886c4633a1e30429da2590 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Fri, 3 Nov 2023 18:06:13 +0530 Subject: [PATCH 13/37] update jhub commit --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index dee830e..37045b1 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@ebe6ba1d3e0d123d732a62bd2305b943f824a522 + - git+https://github.com/nebari-dev/jhub-apps.git@a61f2761fb111c1562922f58db321273adbc7a64 diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 1484d42..2816401 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@ebe6ba1d3e0d123d732a62bd2305b943f824a522 + - git+https://github.com/nebari-dev/jhub-apps.git@a61f2761fb111c1562922f58db321273adbc7a64 From b68007047ad8f1c7a157f610650fbe3d13f4c410 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Fri, 3 Nov 2023 19:18:49 +0530 Subject: [PATCH 14/37] update jhub apps to 3ae44a53e2 --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 37045b1..5b3909b 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@a61f2761fb111c1562922f58db321273adbc7a64 + - git+https://github.com/nebari-dev/jhub-apps.git@3ae44a53e2c6f2caa5c74d9a64f03228cf9968dc diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 2816401..5b9758a 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@a61f2761fb111c1562922f58db321273adbc7a64 + - git+https://github.com/nebari-dev/jhub-apps.git@3ae44a53e2c6f2caa5c74d9a64f03228cf9968dc From f53e1d12a02d7318cd2e87ff903aba4fedf722e1 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Fri, 3 Nov 2023 20:19:08 +0530 Subject: [PATCH 15/37] update jhub --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 5b3909b..df9c8a7 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@3ae44a53e2c6f2caa5c74d9a64f03228cf9968dc + - git+https://github.com/nebari-dev/jhub-apps.git@213889fe41a51b5399227959f9a774934771907f diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 5b9758a..b009a2a 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@3ae44a53e2c6f2caa5c74d9a64f03228cf9968dc + - git+https://github.com/nebari-dev/jhub-apps.git@213889fe41a51b5399227959f9a774934771907f From 28525bea95c18d0e8956819b5550bab7d153dec2 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Sun, 5 Nov 2023 19:18:05 +0530 Subject: [PATCH 16/37] update --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index df9c8a7..cedbd8a 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@213889fe41a51b5399227959f9a774934771907f + - git+https://github.com/nebari-dev/jhub-apps.git@e3ef92bef5fd33537e2053d2cc43fb2c3d161422 diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index b009a2a..75308d0 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@213889fe41a51b5399227959f9a774934771907f + - git+https://github.com/nebari-dev/jhub-apps.git@e3ef92bef5fd33537e2053d2cc43fb2c3d161422 From e555db620b7ad157b31994c95d249e19101c0547 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 6 Nov 2023 07:40:01 +0530 Subject: [PATCH 17/37] jhub more logging --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index cedbd8a..fcddd69 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@e3ef92bef5fd33537e2053d2cc43fb2c3d161422 + - git+https://github.com/nebari-dev/jhub-apps.git@51ecdcdf96addbeb49f6bda4c3980fe21b057476 diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 75308d0..c83682d 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@e3ef92bef5fd33537e2053d2cc43fb2c3d161422 + - git+https://github.com/nebari-dev/jhub-apps.git@51ecdcdf96addbeb49f6bda4c3980fe21b057476 From 0bdaf71bc6f33df3d74dd5fb86e1146515fa01e1 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 6 Nov 2023 08:02:06 +0530 Subject: [PATCH 18/37] config log --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index fcddd69..2901175 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,4 +18,4 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@51ecdcdf96addbeb49f6bda4c3980fe21b057476 + - git+https://github.com/nebari-dev/jhub-apps.git@fd5a71ccdcc625d3e4f894c9c506ebb6dce6f35a diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index c83682d..ccacaf2 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -71,4 +71,4 @@ dependencies: - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@51ecdcdf96addbeb49f6bda4c3980fe21b057476 + - git+https://github.com/nebari-dev/jhub-apps.git@fd5a71ccdcc625d3e4f894c9c506ebb6dce6f35a From e9d9f0f27318c3b815f7eddda64bd54b68b3478a Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 13 Nov 2023 12:43:29 +0530 Subject: [PATCH 19/37] add jupyterlab_pioneer --- jupyterhub/environment.yaml | 1 + jupyterlab/environment.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 2901175..31d1119 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -15,6 +15,7 @@ dependencies: - flask - panel - bokeh + - jupyterlab_pioneer - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index ccacaf2..ca5405b 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -63,6 +63,8 @@ dependencies: - streamlit - traitlets + - jupyterlab_pioneer + - pip: # vscode jupyterlab launcher - git+https://github.com/betatim/vscode-binder From 8c552de6e4504e32ca4da93c264161e5b899ed61 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 13 Nov 2023 12:48:14 +0530 Subject: [PATCH 20/37] add - jupyterlab_pioneer --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 31d1119..b800365 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -15,8 +15,8 @@ dependencies: - flask - panel - bokeh - - jupyterlab_pioneer - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - git+https://github.com/nebari-dev/jhub-apps.git@fd5a71ccdcc625d3e4f894c9c506ebb6dce6f35a + - jupyterlab_pioneer diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index ca5405b..a31f298 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -63,8 +63,6 @@ dependencies: - streamlit - traitlets - - jupyterlab_pioneer - - pip: # vscode jupyterlab launcher - git+https://github.com/betatim/vscode-binder @@ -74,3 +72,4 @@ dependencies: - argo-jupyter-scheduler==2023.7.1 - gradio - git+https://github.com/nebari-dev/jhub-apps.git@fd5a71ccdcc625d3e4f894c9c506ebb6dce6f35a + - jupyterlab_pioneer From fb8db8d35aa5bd6fdf59aac27b6d2f5621eabb35 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 13 Nov 2023 16:10:12 +0530 Subject: [PATCH 21/37] try lab 4 --- jupyterlab/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index a31f298..06f5950 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -13,7 +13,7 @@ dependencies: - ipython > 7 - jupyter-server-proxy - "jupyter_server>=1.18.1" - - jupyterlab >=3 + - jupyterlab >=4 - jupyter_client - jupyter_console - jupyterhub==3.1.1 From 1bdc26fd61f3deaa322d4c583f905fe66750b6ff Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 13 Nov 2023 16:16:32 +0530 Subject: [PATCH 22/37] upgrade server --- jupyterlab/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 06f5950..94c8561 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -12,7 +12,7 @@ dependencies: - nb_conda_kernels - ipython > 7 - jupyter-server-proxy - - "jupyter_server>=1.18.1" + - "jupyter_server>=2.4.0" - jupyterlab >=4 - jupyter_client - jupyter_console From 8587e3e3f5add3f7a2aa8af1999427be1fb9c6ec Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 13 Nov 2023 16:20:23 +0530 Subject: [PATCH 23/37] remove retro and video --- jupyterlab/environment.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 94c8561..ed79912 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -19,13 +19,11 @@ dependencies: - jupyterhub==3.1.1 - nbconvert - nbval - - retrolab # jupyterlab extensions - dask_labextension >= 5.3.0 - jupyterlab-git >=0.30.0 - sidecar >=0.5.0 - - jupyter-videochat >=0.5.0 - ipywidgets ==7.7.1 - ipyleaflet >=0.13.5 - pyviz_comms >=2.0.1 From 65110c8621e2c86e642f572ff27bbb58bb1d19a1 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 13 Nov 2023 16:26:09 +0530 Subject: [PATCH 24/37] remove voila --- jupyterlab/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index ed79912..da909a5 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -56,7 +56,7 @@ dependencies: - bokeh-root-cmd - jhsingle-native-proxy - panel - - voila + # - voila - dash - streamlit - traitlets From c58f68cbf803bc411d42f570766b06dc656239d0 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 13 Nov 2023 20:39:24 +0530 Subject: [PATCH 25/37] remove jupyter-tensorboard --- jupyterlab/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index da909a5..bd274c7 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -65,7 +65,7 @@ dependencies: # vscode jupyterlab launcher - git+https://github.com/betatim/vscode-binder - jupyterlab-conda-store==2023.9.1 - - jupyter-tensorboard + # - jupyter-tensorboard - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio From c2c7aed6d3cb0b887fc1fdd22d21e88a595af7a3 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 13 Nov 2023 21:00:39 +0530 Subject: [PATCH 26/37] remove jupyterlab_nvdashboard --- jupyterlab/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index bd274c7..b1dc602 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -66,7 +66,7 @@ dependencies: - git+https://github.com/betatim/vscode-binder - jupyterlab-conda-store==2023.9.1 # - jupyter-tensorboard - - jupyterlab_nvdashboard + # - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - git+https://github.com/nebari-dev/jhub-apps.git@fd5a71ccdcc625d3e4f894c9c506ebb6dce6f35a From fe3f1cc4ae2184cf5163ad2a7052e7f27417cae5 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 13 Nov 2023 21:12:30 +0530 Subject: [PATCH 27/37] remove jupyter nbextension command --- jupyterlab/postBuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyterlab/postBuild b/jupyterlab/postBuild index 5faf07d..5ffbbbb 100755 --- a/jupyterlab/postBuild +++ b/jupyterlab/postBuild @@ -3,7 +3,7 @@ set -euo pipefail set -x # install classic notebook extensions -jupyter nbextension enable --py widgetsnbextension --sys-prefix +# jupyter nbextension enable --py widgetsnbextension --sys-prefix # install code-server extension sh /opt/scripts/install-code-server.sh "/opt/conda/envs/${DEFAULT_ENV}/share" From 12aed4dd92dfd1778dc31646dbf508a088e68ec8 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Wed, 22 Nov 2023 15:04:53 +0530 Subject: [PATCH 28/37] update jhub to add conda+spawner options --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index b800365..3e79ddf 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,5 +18,5 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@fd5a71ccdcc625d3e4f894c9c506ebb6dce6f35a + - git+https://github.com/nebari-dev/jhub-apps.git@cd29476dc530c4125a1e9310309c3bee1bcba069 - jupyterlab_pioneer diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index b1dc602..c2c3928 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -69,5 +69,5 @@ dependencies: # - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@fd5a71ccdcc625d3e4f894c9c506ebb6dce6f35a + - git+https://github.com/nebari-dev/jhub-apps.git@cd29476dc530c4125a1e9310309c3bee1bcba069 - jupyterlab_pioneer From c1dcc2d362bb99fd2a985f46525b54be7ad01e3d Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Wed, 22 Nov 2023 16:07:52 +0530 Subject: [PATCH 29/37] add nebari int branch --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 3e79ddf..f92b822 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,5 +18,5 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@cd29476dc530c4125a1e9310309c3bee1bcba069 + - git+https://github.com/nebari-dev/jhub-apps.git@098bd8f73fc48940f7312ef51ef62ca565aa3024 - jupyterlab_pioneer diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index c2c3928..dc82684 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -69,5 +69,5 @@ dependencies: # - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@cd29476dc530c4125a1e9310309c3bee1bcba069 + - git+https://github.com/nebari-dev/jhub-apps.git@098bd8f73fc48940f7312ef51ef62ca565aa3024 - jupyterlab_pioneer From 393310aab1f0c49f520d2d15f9cecb4a1281885c Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Wed, 22 Nov 2023 16:45:59 +0530 Subject: [PATCH 30/37] pass in env to service --- jupyterhub/environment.yaml | 2 +- jupyterlab/environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index f92b822..44064fa 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -18,5 +18,5 @@ dependencies: - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@098bd8f73fc48940f7312ef51ef62ca565aa3024 + - git+https://github.com/nebari-dev/jhub-apps.git@0d41114210d9b5b69e896bcb2e13ef7082ba0395 - jupyterlab_pioneer diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index dc82684..83e631e 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -69,5 +69,5 @@ dependencies: # - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@098bd8f73fc48940f7312ef51ef62ca565aa3024 + - git+https://github.com/nebari-dev/jhub-apps.git@0d41114210d9b5b69e896bcb2e13ef7082ba0395 - jupyterlab_pioneer From 8bd675c7229e068426363aed9a2470d702907979 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Tue, 5 Dec 2023 05:14:39 +0000 Subject: [PATCH 31/37] remove jhub dependencies --- jupyterhub/environment.yaml | 6 ------ jupyterlab/environment.yaml | 13 ------------- 2 files changed, 19 deletions(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 44064fa..7649334 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -11,12 +11,6 @@ dependencies: - kubernetes_asyncio - jupyterhub-idle-culler==1.2.1 - sqlalchemy==1.4.46 - # JHub Apps dependencies - - flask - - panel - - bokeh - pip: - nebari-jupyterhub-theme - python-keycloak==0.26.1 - - git+https://github.com/nebari-dev/jhub-apps.git@0d41114210d9b5b69e896bcb2e13ef7082ba0395 - - jupyterlab_pioneer diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 910082b..5d1438b 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -50,23 +50,10 @@ dependencies: - importnb - git-lfs - # JHub Apps dependencies - - flask - - plotlydash-tornado-cmd - - bokeh-root-cmd - - jhsingle-native-proxy - - panel - # - voila - - dash - - streamlit - - traitlets - - pip: # vscode jupyterlab launcher - git+https://github.com/betatim/vscode-binder - jupyterlab-conda-store==2023.10.1 - # - jupyter-tensorboard - # - jupyterlab_nvdashboard - argo-jupyter-scheduler==2023.7.1 - jupyter_ai - gradio From 2d582d3f23d3f5a4577a9148b32bdfc55b18240c Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Tue, 5 Dec 2023 05:18:10 +0000 Subject: [PATCH 32/37] dont upgrade jupyterhub --- jupyterhub/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyterhub/environment.yaml b/jupyterhub/environment.yaml index 7649334..595c826 100644 --- a/jupyterhub/environment.yaml +++ b/jupyterhub/environment.yaml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: - pip==21.1.2 - - jupyterhub==4.0.2 + - jupyterhub==3.1.1 - jupyterhub-kubespawner==4.2.0 - oauthenticator==15.1.0 - escapism==1.0.1 From 8fc405f93ba501f39d3343725495955de5eb2bb3 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Tue, 5 Dec 2023 05:25:23 +0000 Subject: [PATCH 33/37] remove gradio and jhub --- jupyterlab/environment.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 5d1438b..cc73266 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -56,6 +56,4 @@ dependencies: - jupyterlab-conda-store==2023.10.1 - argo-jupyter-scheduler==2023.7.1 - jupyter_ai - - gradio - - git+https://github.com/nebari-dev/jhub-apps.git@0d41114210d9b5b69e896bcb2e13ef7082ba0395 - jupyterlab_pioneer From 69e523629c08a2529087c2038d6688f79385b228 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Tue, 5 Dec 2023 12:36:15 +0000 Subject: [PATCH 34/37] undo build --- .github/workflows/build-push-docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-push-docker.yaml b/.github/workflows/build-push-docker.yaml index e033df8..17dfc42 100644 --- a/.github/workflows/build-push-docker.yaml +++ b/.github/workflows/build-push-docker.yaml @@ -7,7 +7,7 @@ on: workflow_dispatch: null push: branches: - - "*" + - main paths: - "Dockerfile.*" From 30852b338607477ab6eb6f66c97c244133ef8716 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Tue, 5 Dec 2023 12:37:13 +0000 Subject: [PATCH 35/37] remove comment about nbextension install --- jupyterlab/postBuild | 3 --- 1 file changed, 3 deletions(-) diff --git a/jupyterlab/postBuild b/jupyterlab/postBuild index 5ffbbbb..1dae4a3 100755 --- a/jupyterlab/postBuild +++ b/jupyterlab/postBuild @@ -2,9 +2,6 @@ set -euo pipefail set -x -# install classic notebook extensions -# jupyter nbextension enable --py widgetsnbextension --sys-prefix - # install code-server extension sh /opt/scripts/install-code-server.sh "/opt/conda/envs/${DEFAULT_ENV}/share" From f85c644312d5f77c85146431c6916c3dbdcb7298 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Tue, 19 Dec 2023 12:25:46 +0000 Subject: [PATCH 36/37] move jupyterlab_pioneer to conda section --- jupyterlab/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index cc73266..57c6c24 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -31,6 +31,7 @@ dependencies: - nbgitpuller - jupyterlab_code_formatter - jupyterlab-spellchecker >= 0.7.3 + - jupyterlab_pioneer # viz tools - param @@ -56,4 +57,3 @@ dependencies: - jupyterlab-conda-store==2023.10.1 - argo-jupyter-scheduler==2023.7.1 - jupyter_ai - - jupyterlab_pioneer From 0f8682cbf85c11e201da81d8c60a2829a8d281d7 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Tue, 19 Dec 2023 13:23:01 +0000 Subject: [PATCH 37/37] fix jupyterlab-pioneer name --- jupyterlab/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyterlab/environment.yaml b/jupyterlab/environment.yaml index 57c6c24..e3db11e 100644 --- a/jupyterlab/environment.yaml +++ b/jupyterlab/environment.yaml @@ -31,7 +31,7 @@ dependencies: - nbgitpuller - jupyterlab_code_formatter - jupyterlab-spellchecker >= 0.7.3 - - jupyterlab_pioneer + - jupyterlab-pioneer # viz tools - param