Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge 6222/6223 to prod #6225

Merged
merged 6 commits into from
Sep 20, 2024
+20 −16
Merged

merge 6222/6223 to prod #6225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
09506d2
bumping jupyter core packages, moving some from pip to conda
shaneknapp Sep 19, 2024
91b5153
fixing some package defs
shaneknapp Sep 19, 2024
3d73320
Merge pull request #6222 from shaneknapp/bump-data100-infra-packages
shaneknapp Sep 19, 2024
89e41bc
Increase RAM and CPU for Data 100 staff
balajialg Sep 20, 2024
8a86e52
Adding note that this allocation should be removed by 09/30
balajialg Sep 20, 2024
2ba111e
Merge pull request #6223 from balajialg/data100_ram_students
shaneknapp Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion deployments/data100/config/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
29 changes: 14 additions & 15 deletions deployments/data100/image/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,19 @@ 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.14.2
- jupytext==1.16.4
- nbgitpuller==1.2.1
- notebook==7.0.7
- notebook==7.2.2
- folium==0.14.0
- h5netcdf==1.0.2
- ipywidgets==8.0.7
Expand All @@ -25,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
Expand All @@ -47,19 +51,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]
- nbconvert[webpdf]==7.16.4
# - 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
Loading