Merge pull request #5961 from berkeley-dsep-infra/staging

shaneknapp · web-flow · commit ced59a7c736d · 2024-08-16T09:49:45.000-07:00
merging 5957 to prod
diff --git a/deployments/a11y/image/environment.yml b/deployments/a11y/image/environment.yml
@@ -11,7 +11,7 @@ dependencies:
 - jupyter_server==2.7.0
 - jupyter-book==0.15.1
 - jupyter-resource-usage==0.7.1
-- jupyterhub==4.1.5
+- jupyterhub==4.1.6
 - matplotlib==3.7.1
 - nbgitpuller==1.2.1
 - nbclassic==1.0.0
diff --git a/deployments/a11y/image/infra-requirements.txt b/deployments/a11y/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/astro/image/environment.yml b/deployments/astro/image/environment.yml
@@ -72,7 +72,7 @@ dependencies:
   - lightkurve
   - ipyparallel>=8.1.0
   - jupyter-tensorboard>=0.2.0
-  - line_profiler>-3.4.0
+  - line_profiler>=3.4.0
   - snakeviz>=2.1.1
   - memory_profiler>=0.60.0
   - flask>=2.0.2
diff --git a/deployments/astro/image/infra-requirements.txt b/deployments/astro/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/biology/image/infra-requirements.txt b/deployments/biology/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/cee/image/infra-requirements.txt b/deployments/cee/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/data100/image/environment.yml b/deployments/data100/image/environment.yml
@@ -51,7 +51,7 @@ dependencies:
   - ipywidgets==8.0.7
   # disable until fixed (probably this:  https://github.com/jupyterlab/jupyter-collaboration/issues/162)
   # - jupyter_collaboration==1.0.1
-  - jupyterhub==4.1.5
+  - jupyterhub==4.1.6
   - nbconvert[webpdf]
   #  - pyppeteer==2.0.0
   - pytest-notebook==0.8.1
diff --git a/deployments/data100/image/infra-requirements.txt b/deployments/data100/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/data101/image/environment.yml b/deployments/data101/image/environment.yml
@@ -100,7 +100,7 @@ dependencies:
   - ipywidgets==8.0.7
   # disable until fixed (probably this:  https://github.com/jupyterlab/jupyter-collaboration/issues/162)
   # - jupyter_collaboration==1.0.1
-  - jupyterhub==4.1.5
+  - jupyterhub==4.1.6
   - nbconvert[webpdf]==7.16.4
   - pytest-notebook==0.8.1
   - pymongo==4.4.1
diff --git a/deployments/data101/image/infra-requirements.txt b/deployments/data101/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/data102/image/environment.yml b/deployments/data102/image/environment.yml
@@ -46,7 +46,7 @@ dependencies:
   - ipywidgets==8.0.7
   # disable until fixed (probably this:  https://github.com/jupyterlab/jupyter-collaboration/issues/162)
   # - jupyter_collaboration==1.0.1
-  - jupyterhub==4.1.5
+  - jupyterhub==4.1.6
   - nbconvert[webpdf]==7.16.4
   - gh-scoped-creds==4.1
   - nb2pdf==0.6.2
diff --git a/deployments/data102/image/infra-requirements.txt b/deployments/data102/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/data8/image/environment.yml b/deployments/data8/image/environment.yml
@@ -4,7 +4,7 @@ dependencies:
 - python==3.11.*
 
 # Packages ported from infra-reqs
-- jupyterhub==4.1.5
+- jupyterhub==4.1.6
 - jupyter-resource-usage==1.0.1
 - nbgitpuller==1.2.1
 - syncthing==1.18.6
diff --git a/deployments/data8/image/infra-requirements.txt b/deployments/data8/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/datahub/images/default/infra-requirements.txt b/deployments/datahub/images/default/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/dev/images/default/infra-requirements.txt b/deployments/dev/images/default/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/dev/images/secondary/environment.yml b/deployments/dev/images/secondary/environment.yml
@@ -7,7 +7,7 @@ channels:
 dependencies:
 - python==3.11.*
 - git==2.39.1
-- jupyterhub==4.1.5
+- jupyterhub==4.1.6
 - jupyter_app_launcher==0.2.1
 - jupyter-cache==1.0.0
 - jupyter-resource-usage==1.0.0
diff --git a/deployments/dev/images/secondary/infra-requirements.txt b/deployments/dev/images/secondary/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/edx/image/environment.yml b/deployments/edx/image/environment.yml
@@ -39,7 +39,7 @@ dependencies:
   - ipywidgets==8.0.7
   # disable until fixed (probably this:  https://github.com/jupyterlab/jupyter-collaboration/issues/162)
   # - jupyter_collaboration==1.0.1
-  - jupyterhub==4.1.5
+  - jupyterhub==4.1.6
   - jupyterlab-accessible-themes==0.2.0
   - nbconvert==7.6.0
   - pytest-notebook==0.8.1
diff --git a/deployments/edx/image/infra-requirements.txt b/deployments/edx/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/eecs/image/infra-requirements.txt b/deployments/eecs/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/ischool/image/infra-requirements.txt b/deployments/ischool/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/julia/image/infra-requirements.txt b/deployments/julia/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/logodev/image/environment.yml b/deployments/logodev/image/environment.yml
@@ -51,7 +51,7 @@ dependencies:
   - ipywidgets==8.0.7
   # disable until fixed (probably this:  https://github.com/jupyterlab/jupyter-collaboration/issues/162)
   # - jupyter_collaboration==1.0.1
-  - jupyterhub==4.1.5
+  - jupyterhub==4.1.6
   - nbconvert[webpdf]
   #  - pyppeteer==2.0.0
   - pytest-notebook==0.8.1
diff --git a/deployments/logodev/image/infra-requirements.txt b/deployments/logodev/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/publichealth/image/infra-requirements.txt b/deployments/publichealth/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/shiny/image/environment.yml b/deployments/shiny/image/environment.yml
@@ -6,7 +6,7 @@ dependencies:
 - jupyter-server-proxy==4.2.0
 - jupyter-rsession-proxy==2.2.0
 - jupyter-syncthing-proxy==1.0.3
-- jupyterhub==4.1.5
+- jupyterhub==4.1.6
 - jupyterlab==4.0.11
 - nbgitpuller==1.2.1
 - notebook==7.0.7
diff --git a/deployments/shiny/image/infra-requirements.txt b/deployments/shiny/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/stat159/image/environment.yml b/deployments/stat159/image/environment.yml
@@ -150,7 +150,7 @@ dependencies:
   - pip:
     - jupysql==0.10.5
     - ipytest==0.13.0
-    - jupyterhub==4.1.5
+    - jupyterhub==4.1.6
     - nbval==0.10.0
     - nbdime==3.2.0
 
diff --git a/deployments/stat159/image/infra-requirements.txt b/deployments/stat159/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/stat20/image/infra-requirements.txt b/deployments/stat20/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/deployments/ugr01/image/environment.yml b/deployments/ugr01/image/environment.yml
@@ -51,7 +51,7 @@ dependencies:
   - ipywidgets==8.0.7
   # disable until fixed (probably this:  https://github.com/jupyterlab/jupyter-collaboration/issues/162)
   # - jupyter_collaboration==1.0.1
-  - jupyterhub==4.1.5
+  - jupyterhub==4.1.6
   - nbconvert[webpdf]
   #  - pyppeteer==2.0.0
   - pytest-notebook==0.8.1
diff --git a/deployments/ugr01/image/infra-requirements.txt b/deployments/ugr01/image/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
diff --git a/hub/Chart.yaml b/hub/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: '1.0'
 description: Deployment Chart for JupyterHub
 name: hub
-version: 20240731-224556
+version: 20240731-224556.git.8057.h9643afd4
diff --git a/hub/requirements.yaml b/hub/requirements.yaml
@@ -4,5 +4,5 @@ dependencies:
    # get the helm chart version from here:  https://github.com/jupyterhub/helm-chart
    # correlate the helm chart version w/jupyterhub here:
    # https://hub.jupyter.org/helm-chart/#development-releases-jupyterhub
-   version: 3.3.7
+   version: 3.3.8
    repository: https://jupyterhub.github.io/helm-chart/
diff --git a/hub/values.yaml b/hub/values.yaml
@@ -241,7 +241,7 @@ jupyterhub:
     # Generated by chartpress
     image:
       name: gcr.io/ucb-datahub-2018/jupyterhub-hub
-      tag: '20240731-224556'
+      tag: '20240731-224556.git.8057.h9643afd4'
     networkPolicy:
       enabled: true
       # interNamespaceAccessLabels=accept makes the hub pod's associated
diff --git a/images/hub/Dockerfile b/images/hub/Dockerfile
@@ -1,6 +1,6 @@
 # Should match the hub image used by version of chart in hub/requirements.yaml
 # If that changes, this should be changed too!
-FROM jupyterhub/k8s-hub:3.3.7
+FROM jupyterhub/k8s-hub:3.3.8
 
 USER root
 
diff --git a/node-placeholder/Chart.yaml b/node-placeholder/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 20240731-224556
+version: 20240731-224556.git.8054.h2abbc5d2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/scripts/infra-packages/requirements.txt b/scripts/infra-packages/requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
