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

Merging #4578, #4581, #4582, #4583, #4584, #4585, #4586, #4587 to prod

.circleci/config.yml

@@ -12,15 +12,14 @@ orbs:
             default: false
 
         docker:
-          - image: python:3.7-slim-buster
+          - image: python:3.7-slim-bullseye
         working_directory: ~/repo
         steps:
           - checkout
           - run:
               name: Install git & curl
               command: |
                 apt-get update && apt-get install --yes --no-install-recommends git curl
-
           - restore_cache:
               keys:
                 - v3.7-dependencies-{{ checksum "requirements.txt" }}
@@ -106,7 +105,7 @@ orbs:
 jobs:
   deploy:
     docker:
-      - image: python:3.7-slim-buster
+      - image: python:3.8-slim-bullseye
     working_directory: ~/repo
     steps:
       - run:
@@ -129,9 +128,6 @@ jobs:
             source venv/bin/activate
             pip install --upgrade -r requirements.txt
 
-            # Keep same repo2docker version in build & deploy jobs
-            pip install --upgrade git+https://github.com/jupyter/repo2docker.git@968cc43a9e238916b5032edbf84e309c8d4ff35e
-
             # Can be removed once https://github.com/docker/docker-py/issues/2225 is merged and released
             pip install --upgrade git+https://github.com/docker/docker-py.git@b6f6e7270ef1acfe7398b99b575d22d0d37ae8bf
 

.github/labeler.yml

@@ -36,14 +36,14 @@ images:
   - "**/*.svg"
 
 # add labels to docs
-documentation:
-  - '**/*.txt'
-  - 'docs/**'
-  - '**/*.md'
-  - '!**/apt.txt'
-  - '!**/infra-requirements.txt'
-  - '!**/requirements.txt'
-  - '!**/runtime.txt'
+# documentation:
+#   - '**/*.txt'
+#   - 'docs/**'
+#   - '**/*.md'
+#   - '!**/apt.txt'
+#   - '!**/infra-requirements.txt'
+#   - '!**/requirements.txt'
+#   - '!**/runtime.txt'
 
 # add build-infra label to any .github or circleci changes
 build-infra:

deployments/a11y/hubploy.yaml

@@ -1,5 +1,9 @@
 images:
-  image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image
+  images:
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image
+      path: image/
+      repo2docker:
+        base_image: docker.io/library/buildpack-deps:jammy
   registry:
     provider: gcloud
     gcloud:

deployments/a11y/image/apt.txt

@@ -4,10 +4,7 @@
 # Download tools
 curl
 wget
-
-# Core text editors on a *nix box: vim and emacs
 vim
-python-mode
 
 # for easily managing multiple repositories with one command (perl-doc
 # is needed for its help pages to work)
@@ -16,7 +13,6 @@ perl-doc
 
 # Regular build tools for compiling common stuff
 build-essential
-gfortran
 
 # Dependencies for nbconvert
 texlive-xetex

deployments/a11y/image/environment.yml

@@ -32,6 +32,6 @@ dependencies:
   # The items below are from infra-requirements, however lab conflicts with the
   # alpha notebook.
   # We disable infre-requirements.txt above and manually enable some of what it
-  # provides below.
+  # provides below. 
   # ###
   # Matches version in images/hub/Dockerfile

deployments/cee/image/environment.yml

@@ -6,17 +6,17 @@ channels:
 dependencies:
 - python=3.9.*
 #adding math functionality 
-- matplotlib
-- scipy
-- mpld3
+- matplotlib=3.7.*
+- scipy=1.10.*
+- mpld3=0.5.*
 
 # Needed for linux desktop environment
-- websockify
+- websockify=0.11.0
 
 - qgis=3.22.*
 
 # Maybe needed for qgis? https://github.com/conda-forge/qgis-feedstock/issues/263
-- pyopencl
+- pyopencl=2023.1
 
 - pip
 - pip:

deployments/data100/hubploy.yaml

@@ -1,5 +1,9 @@
 images:
-  image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-user-image
+  images:
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-user-image
+      path: image/
+      repo2docker:
+        base_image: docker.io/library/buildpack-deps:jammy
   registry:
     provider: gcloud
     gcloud:

deployments/data100/image/apt.txt

@@ -16,7 +16,6 @@ wget
 vim
 emacs-nox
 emacs-goodies-el
-python-mode
 
 # A couple of CLI editors that are easier than vim
 # micro  # currently not working on 18.04
@@ -91,4 +90,4 @@ qgit
 meld
 
 # For jupyter-tree-download. Ref: https://github.com/berkeley-dsep-infra/datahub/issues/3979			
-zip
+zip

deployments/eecs/hubploy.yaml

@@ -1,5 +1,9 @@
 images:
-  image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/eecs-user-image
+  images:
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/eecs-user-image
+      path: image/
+      repo2docker:
+        base_image: docker.io/library/buildpack-deps:jammy
   registry:
     provider: gcloud
     gcloud:

deployments/eecs/image/apt.txt

@@ -1,4 +1,4 @@
-# For desktop environment
+# For desktop environment 
 dbus-x11
 xfce4
 xfce4-panel
@@ -16,7 +16,9 @@ xfce4-terminal
 default-jdk
 # Qt for pyqt based exercises in our desktop environment
 # https://github.com/berkeley-dsep-infra/datahub/issues/1505
-qt5-default
+# Does not exist in Jammy # qt5-default 
+qtbase5-dev
+qt5-qmake
 
 # https://github.com/berkeley-dsep-infra/datahub/issues/2535
 emacs

deployments/stat159/hubploy.yaml

@@ -1,5 +1,9 @@
 images:
-  image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/stat159-user-image
+  images:
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/stat159-user-image
+      path: image/
+      repo2docker:
+        base_image: docker.io/library/buildpack-deps:jammy
   registry:
     provider: gcloud
     gcloud:

deployments/stat159/image/apt.txt

@@ -17,7 +17,6 @@ zip
 vim
 emacs-nox
 emacs-goodies-el
-python-mode
 
 # A couple of CLI editors that are easier than vim
 # micro  # currently not working on 18.04

deployments/workshop/secrets/prod.yaml

@@ -2,7 +2,7 @@ jupyterhub:
     hub:
         config:
             DummyAuthenticator:
-                password: ENC[AES256_GCM,data:tuxLtmqhQjDiPUCm3vZ0r8qQNm9Jh5W+SQ==,iv:+P7UPF5vajPf3etMIjvlU67OUROZ4zVHxHsb1RiBTOw=,tag:SxYWmunaUIF43QswaqgL/g==,type:str]
+                password: ENC[AES256_GCM,data:jc45W/tC58WtISzVyHweGDkAKtuJ/vG3Hg==,iv:UzhroVxL+LE+EgHWQHCegjENO72q3Ch7B77ZJvnzK9k=,tag:mpJ+tWpQ7G03WbxwbrrtYw==,type:str]
     singleuser:
         extraEnv:
             GOOGLE_SHEETS_READONLY_KEY: ENC[AES256_GCM,data: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,iv:k2t0g2FabnCXzIWNAEsY4sHubrJCRCRKjRRpNBeqrYU=,tag:IEchnbKWgLRcJTEM90BZDg==,type:str]
@@ -15,8 +15,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2021-05-05T12:50:17Z"
-    mac: ENC[AES256_GCM,data:Pas4CU0CSUEP9smCAOzH19GmP3C/T0D+aNFkQ4h0Jb61p7s17QvIQeBB7aiI4VShi1HeHLQpSeIkJ2ZTwPLvRFHCQSwtL+SCqKwDmir6h429GJMBGbDFQZoIIMXFUCmdNFngpMfaA9Nek6vNlIXk0cCwFXWJnrTJHOPTTORmml8=,iv:kbpozHSVpbkiormZ/l1F6XKwwE1SuYJctqi0AhdYTnM=,tag:J15JYcX2ZF32Fs69rKS76A==,type:str]
+    lastmodified: "2023-05-18T21:42:00Z"
+    mac: ENC[AES256_GCM,data:ZAhhGHippZ4Y1IfhgorWlDo/5q0kkuX+D+9cK+3uQfLFCEMBBy0OrrSfI2z40q7emD7KdxRZWgQlJnW4olGeRETy4zqZczJxQ3JqmSHCXNXmqzB/m9lSQJtnjhKr6ZdukNtbU9ngZtOc3ib2L8neyaqADvnTr2EyfYYzGVONj0k=,iv:O85wO+fsPObZcxzGZI9EHxNT9zZg2r8RH3nd5MujwaI=,tag:9xMDXZzecOV4cc6q3YiVOw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.7.1
+    version: 3.7.3

deployments/workshop/secrets/staging.yaml

@@ -2,7 +2,7 @@ jupyterhub:
     hub:
         config:
             DummyAuthenticator:
-                password: ENC[AES256_GCM,data:iSpHe6U+lv9Rwe7JrTTgBbS4jHFj7OFHsA==,iv:2IRg+9JCNRRlQeFcc+iwCxHKs8t3dVTmTdbQHvrDkjE=,tag:GX0VM4m+/60nMnPW1uQV4A==,type:str]
+                password: ENC[AES256_GCM,data:MZGNzWUaaNVQhmSl1WaX65PPYoutB0P8hg==,iv:V9K2DSM+lCw79Q7Jdfkv3xU/PZJCFcrRy9P3wD9qE5w=,tag:7GTepK8nU6RInZ34DlFb9g==,type:str]
     singleuser:
         extraEnv:
             GOOGLE_SHEETS_READONLY_KEY: ENC[AES256_GCM,data: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,iv:J4uurXirX3oNAnePNijCpE+MCFb5Vb3VBEv8Cw8laeg=,tag:+RFKy8FK4Bh2lpef9ERuLA==,type:str]
@@ -15,8 +15,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2021-05-05T12:50:17Z"
-    mac: ENC[AES256_GCM,data:uDz+Wymk1SLH3zqT73nGgtItNelGxanqgKq8adKa4SCpKqP3M3e7K1Gd3SM9/EaLDFaRzwgW1DVHS+w4xPGvFQlmWH1+Jagumpmqz+Z09KUtxKXrxyKNJyx4WmYz1vKZvsl+1F0KZARpw0ougLWKzzht0A/R42KR5NsoFJa/ZuU=,iv:mVg3gCdYXoVNcFcXco+BfdwCdjEWjifPudHxqac3vwk=,tag:GHcdDPHc8QtOWFZpKsi4Cw==,type:str]
+    lastmodified: "2023-05-18T21:42:29Z"
+    mac: ENC[AES256_GCM,data:F7c39JLwSlRgxzc+Fs3C+y1T5DPKuxRA8pYSeVH40McT7NqwO15Qg4hNmltZYSxc+5zgSedn/pk7e8hVlqhcUShlE30d6yF4WqxEE8H4mTRjAF+1+4SDlaTRAYLLkOC174//R09rdvgt5tOqSnsZqeSmJ4h4ITtZMSs+9PdePAE=,iv:yhUCsB2TwRZKQyUwKmnI5Fo/LB95ACIpG0bIn4+cL5k=,tag:n8oFLycBc26BnjdcEENV0g==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.7.1
+    version: 3.7.3

requirements.txt

@@ -1,6 +1,7 @@
-hubploy==0.2
+# allow for base image specification in hubploy.yaml
+git+https://github.com/berkeley-dsep-infra/hubploy.git@9cff64d3d2294085896de54f97dfa8bef9034159
 pygithub
 chartpress
-git+https://github.com/jupyterhub/repo2docker.git@d688997aeec52ff1898265bccf1bbfd5a56f6a3f
+git+https://github.com/jupyterhub/repo2docker.git@5894f63b8799e06861bad66bc24ee3ddcbc09359
 myst-parser
 chardet