Skip to content

Commit

Permalink
Merge pull request #5915 from balajialg/espm157_ver2
Browse files Browse the repository at this point in the history
Set up ESPM 157 course for FA 24 (Round 2)
  • Loading branch information
shaneknapp authored Aug 12, 2024
2 parents 7337e4a + d86412a commit 1cd5d11
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 1 deletion.
4 changes: 4 additions & 0 deletions deployments/datahub/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -200,3 +200,7 @@ jupyterhub:
course::1535590: # Data 6, https://github.com/berkeley-dsep-infra/datahub/issues/5847
mem_limit: 2048M
mem_guarantee: 2048M

course::1537045: # ESPM 157, https://github.com/berkeley-dsep-infra/datahub/issues/5914
mem_limit: 4096M
mem_guarantee: 4096M
12 changes: 12 additions & 0 deletions deployments/datahub/images/default/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,18 @@ RUN /usr/local/sbin/connector-text.bash
#COPY connectors/2021-fall-phys-188-288.bash /usr/local/sbin/
#RUN /usr/local/sbin/2021-fall-phys-188-288.bash

#ESPM, FA 24
# https://github.com/berkeley-dsep-infra/datahub/issues/5827
ENV VSCODE_EXTENSIONS=${CONDA_DIR}/share/code-server/extensions
USER root
RUN mkdir -p ${VSCODE_EXTENSIONS} && \
chown -R jovyan:jovyan ${VSCODE_EXTENSIONS}
USER ${NB_USER}
# Install Code Server Jupyter extension
RUN /srv/conda/bin/code-server --extensions-dir ${VSCODE_EXTENSIONS} --install-extension ms-toolsai.jupyter
# Install Code Server Python extension
RUN /srv/conda/bin/code-server --extensions-dir ${VSCODE_EXTENSIONS} --install-extension ms-python.python

# clear out /tmp
USER root
RUN rm -rf /tmp/*
Expand Down
3 changes: 2 additions & 1 deletion deployments/datahub/images/default/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ dependencies:
- rtree==1.2.0

# [DH-319] https://github.com/berkeley-dsep-infra/datahub/issues/5827, ESPM 157
- ibis-framework[pandas]==9.2.0
- ibis-framework[pandas,duckdb]==9.2.0
- jupyterlab_myst==2.4.2

# ATTEMPT TO PUT NEW PACKAGES IN THE CONDA LIST ABOVE FIRST, RATHER THAN PIP

0 comments on commit 1cd5d11

Please sign in to comment.