From 09506d2c0dc97dfe385c076fce7982e5c970afde Mon Sep 17 00:00:00 2001 From: shane knapp Date: Thu, 19 Sep 2024 15:25:45 -0700 Subject: [PATCH 1/4] bumping jupyter core packages, moving some from pip to conda --- deployments/data100/image/environment.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/deployments/data100/image/environment.yml b/deployments/data100/image/environment.yml index 3d0da5bb0..722417f5f 100644 --- a/deployments/data100/image/environment.yml +++ b/deployments/data100/image/environment.yml @@ -6,15 +6,20 @@ channels: dependencies: - python==3.11.* -- git==2.39.1 -- jupyter-resource-usage==1.0.0 -- jupyterlab==4.0.11 +- git==2.46.0 +- gh-scoped-creds==4.1 +- jupyter-resource-usage==1.1.0 +- jupyterhub==4.1.6 +- jupyterlab==4.2.5 - jupyterlab-favorites==3.0.0 -- jupyterlab_server==2.23.0 +- jupyterlab-git==0.50.1 +- jupyterlab_server==2.27.3 - jupyterlab_widgets==3.0.8 -- jupyter_server==2.7.0 +- jupyter_server==2.27.3 +# pulled in by ottr, if not pinned to 1.16.2, 1.16.3 causes DH-323 +- jupytext==1.16.2 - nbgitpuller==1.2.1 -- notebook==7.0.7 +- notebook==7.2.2 - folium==0.14.0 - h5netcdf==1.0.2 - ipywidgets==8.0.7 @@ -47,19 +52,14 @@ dependencies: - pycountry==22.3.5 - pip - pip: - # - -r infra-requirements.txt - 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.6 - nbconvert[webpdf] # - pyppeteer==2.0.0 - pytest-notebook==0.8.1 - - gh-scoped-creds==4.1 - git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling - ydata-profiling==4.6.4 - otter-grader==5.4.0 - duckdb==0.10.1 - duckdb_engine==0.11.2 - # pulled in by ottr, if not pinned to 1.16.2, 1.16.3 causes DH-323 - - jupytext==1.16.2 From 91b51532377064adeabfc6392fa9021c98929be5 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Thu, 19 Sep 2024 15:54:37 -0700 Subject: [PATCH 2/4] fixing some package defs --- deployments/data100/image/environment.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/deployments/data100/image/environment.yml b/deployments/data100/image/environment.yml index 722417f5f..984afab6f 100644 --- a/deployments/data100/image/environment.yml +++ b/deployments/data100/image/environment.yml @@ -15,9 +15,8 @@ dependencies: - jupyterlab-git==0.50.1 - jupyterlab_server==2.27.3 - jupyterlab_widgets==3.0.8 -- jupyter_server==2.27.3 -# pulled in by ottr, if not pinned to 1.16.2, 1.16.3 causes DH-323 -- jupytext==1.16.2 +- jupyter_server==2.14.2 +- jupytext==1.16.4 - nbgitpuller==1.2.1 - notebook==7.2.2 - folium==0.14.0 @@ -30,13 +29,13 @@ dependencies: - numpy==1.24.2 - pandas==2.0.2 - plotly==5.13.1 -- requests==2.28.2 +- requests==2.32.2 - scikit-image==0.19.3 - scikit-learn==1.2.2 - scipy==1.10.1 -- seaborn==0.12.2 +- seaborn==0.13.2 - statsmodels==0.14.0 -- tensorflow-cpu==2.12.1 +- tensorflow-cpu==2.17.0 - sqlalchemy==2.0.16 - mlxtend==0.23.0 # Spring 2024 data 100 @@ -55,7 +54,7 @@ dependencies: - ipywidgets==8.0.7 # disable until fixed (probably this: https://github.com/jupyterlab/jupyter-collaboration/issues/162) # - jupyter_collaboration==1.0.1 - - nbconvert[webpdf] + - nbconvert[webpdf]==7.16.4 # - pyppeteer==2.0.0 - pytest-notebook==0.8.1 - git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling From 89e41bcb19c9317efacb4bfbd00e462cc524f0c6 Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Thu, 19 Sep 2024 17:22:03 -0700 Subject: [PATCH 3/4] Increase RAM and CPU for Data 100 staff --- deployments/data100/config/common.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml index ec250bab5..16ab51787 100644 --- a/deployments/data100/config/common.yaml +++ b/deployments/data100/config/common.yaml @@ -123,6 +123,11 @@ jupyterhub: mem_guarantee: 16G cpu_limit: 2 cpu_guarantee: 2 + course::1537664::enrollment_type::student: # Fall 2024, Data 100 TAs, ensured 16G RAM + mem_limit: 16G + mem_guarantee: 16G + cpu_limit: 2 + cpu_guarantee: 2 admin: mem_guarantee: 2G extraVolumeMounts: From 8a86e5239833941ae6ccf63a92dfe18c10abfe4b Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Thu, 19 Sep 2024 17:27:22 -0700 Subject: [PATCH 4/4] Adding note that this allocation should be removed by 09/30 --- deployments/data100/config/common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml index 16ab51787..d60154994 100644 --- a/deployments/data100/config/common.yaml +++ b/deployments/data100/config/common.yaml @@ -112,7 +112,7 @@ jupyterhub: admin: true mem_limit: 4G - # Data 100, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6167 + # Data 100, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6167, To be removed by Sep 30, 2024 course::1537664::enrollment_type::teacher: # Fall 2024, Data 100 Instructors, ensured 16G RAM mem_limit: 16G mem_guarantee: 16G