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

merging 5472/5474/5475/5476/5478 to prod

Author: shaneknapp

deployments/data100/config/common.yaml

@@ -86,6 +86,12 @@ jupyterhub:
       course::1531798::group::Content: # Spring 2024 Content Team, ensured 4G RAM
         mem_limit: 4G
         mem_guarantee: 4G
+
+      # Econ 148, Spring 2024
+      course::1532866: # Temporarily grant 3G of RAM to all students
+        mem_limit: 3G
+        mem_guarantee: 3G
+      
     admin:
       mem_limit: 4G
       mem_guarantee: 2G

deployments/data100/image/environment.yml

@@ -2,6 +2,7 @@ name: data100-FA23
 
 channels:
 - conda-forge
+- pytorch
 
 dependencies:
 - python==3.11.0
@@ -33,6 +34,13 @@ dependencies:
 - tensorflow-cpu==2.12.1
 - sqlalchemy==2.0.16
 - mlxtend==0.23.0
+# Spring 2024 data 100
+- pytorch==2.1.2
+- cpuonly==2.0
+- transformers==4.37.1
+# Spring 2024 table demos
+- lxml==5.1.0
+# Spring 2024 Econ 148 Packages
 - geopandas==0.14.2
 - geopy==2.4.1
 - lifelines==0.27.8

deployments/data8/config/common.yaml

@@ -56,6 +56,20 @@ jupyterhub:
       #    - course::N::enrollment_type::teacher
       #    - course::N::enrollment_type::ta
 
+      # Data 8, Spring 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5358
+      course-staff-1532352:
+      #  description: Enable course staff to view and access servers.
+      #  # this role provides permissions to...
+        scopes:
+          - admin-ui
+          - list:users!group=course::1532352
+          - admin:servers!group=course::1532352
+          - access:servers!group=course::1532352
+      #  # this role will be assigned to...
+        groups:
+          - course::1532352::enrollment_type::teacher
+          - course::1532352::enrollment_type::ta
+
   singleuser:
     extraFiles:
       # DH-216 Removing QtPDF, QtPNG as per Data 8 GSI inputs
@@ -86,14 +100,7 @@ jupyterhub:
 
   custom:
     group_profiles:
-
       # DataHub Infrastructure staff
       # https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
       course::1524699::group::all-admins:
         admin: true
-
-      # Data 8, Spring 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5358
-      course::1532352::enrollment_type::teacher:
-        admin: true
-      course::1532352::enrollment_type::ta:
-        admin: true

deployments/datahub/config/common.yaml

@@ -188,6 +188,6 @@ jupyterhub:
       course::1531172: # ENVECON 153, Spring 2024, issue #5279
         mem_limit: 4096M
         mem_guarantee: 4096M
-      course::1531172: # Econ/Demog 175, Spring 2024, issue #5447
+      course::1531929: # Econ/Demog 175, Spring 2024, issue #5447
         mem_limit: 4096M
         mem_guarantee: 4096M

deployments/prob140/config/common.yaml

@@ -48,6 +48,20 @@ jupyterhub:
       #  groups:
       #    - course::N::enrollment_type::teacher
       #    - course::N::enrollment_type::ta
+ 
+     ## Data C140, Spring 2024, #https://github.com/berkeley-dsep-infra/datahub/issues/5466
+      course-staff-1533557:
+      #  description: Enable course staff to view and access servers.
+        # this role provides permissions to...
+        scopes:
+          - admin-ui
+          - list:users!group=course::1533557
+          - admin:servers!group=course::1533557
+          - access:servers!group=course::1533557
+        # this role will be assigned to...
+        groups:
+          - course::1533557::enrollment_type::teacher
+          - course::1533557::enrollment_type::ta
 
     nodeSelector:
       hub.jupyter.org/pool-name: core-pool-2023-12-21