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.

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

Merging #5984, #5983, #5981 to prod #5985

Merged
merged 7 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/quarto-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
contents: write
# Don't run in forks, unless the forker sets a secret variable. I chose to
# use a secret rather than a var because secrets are not copied to forks.
if: github.event.repository.fork == false || secrets.ALLOW_FORK_DEPLOY == 'true'
if: ${{ github.event.repository.fork == false || secrets.ALLOW_FORK_DEPLOY == 'true' }}
steps:
- name: Check out repository
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions deployments/datahub/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ jupyterhub:
# DataHub Infrastructure staff
# https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
course::1524699::group::all-admins:
mem_limit: 2048M
mem_guarantee: 2048M
mem_limit: 4096M
mem_guarantee: 4096M

# Demog Data Event, April 1 - Sep 30, https://github.com/berkeley-dsep-infra/datahub/issues/5643
course::1534506::enrollment_type::teacher:
Expand Down
4 changes: 2 additions & 2 deletions deployments/datahub/images/default/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- pandas==2.2.2
- statsmodels=0.13.5
- scikit-learn=1.4.*
- seaborn=0.11.*
- seaborn=0.13.2
# - bokeh=2.3.*
- decorator=5.0.*
- networkx=2.6.*
Expand Down Expand Up @@ -232,6 +232,6 @@ dependencies:

# [DH-319] https://github.com/berkeley-dsep-infra/datahub/issues/5827, ESPM 157
- ibis-framework[pandas,duckdb]==9.2.0
- jupyterlab_myst==2.4.2
# - jupyterlab_myst==2.4.2 (Causing issues with rendering of the latex output for a CEE course)

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