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 5767/5773/5774/5775 to prod #5776

Merged
merged 10 commits into from
Jun 6, 2024
20 changes: 10 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -745,15 +745,15 @@ workflows:
branches:
only:
- staging
#- hubploy/build-image:
# deployment: logodev
# name: logodev image build
# push: true
# # Filters can only be per-job? wtf
# filters:
# branches:
# only:
# - staging
- hubploy/build-image:
deployment: logodev
name: logodev image build
push: true
# Filters can only be per-job? wtf
filters:
branches:
only:
- staging
- hubploy/build-image:
deployment: publichealth
name: publichealth image build
Expand Down Expand Up @@ -810,7 +810,7 @@ workflows:
- eecs image build
- ischool image build
- julia hub image build
#- logodev image build
- logodev image build
- publichealth image build
- shiny image build
- stat159 image build
Expand Down
1 change: 1 addition & 0 deletions deployments/a11y/image/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ dependencies:
- nbconvert-a11y==2023.12.6
- nb2pdf==0.6.2
- nbpdfexport==0.2.1
- jupyterlab-a11y-checker==0.1.1
# ###
# The items below are from infra-requirements, however lab conflicts with the
# alpha notebook.
Expand Down
2 changes: 1 addition & 1 deletion deployments/a11y/image/postBuild
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ set -eux
# install pa11y tools for DH-169

npm install -g [email protected]
npm install -g [email protected]
npm install -g [email protected]
3 changes: 2 additions & 1 deletion deployments/datahub/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ jupyterhub:
# DataHub Infrastructure staff
# https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
course::1524699::group::all-admins:
admin: true
mem_limit: 2048M
mem_guarantee: 2048M

# Demog Data Event, April 1 - Sep 30, https://github.com/berkeley-dsep-infra/datahub/issues/5643
course::1534506::enrollment_type::teacher:
Expand Down
3 changes: 3 additions & 0 deletions deployments/datahub/images/default/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ dependencies:
- syncthing==1.18.6
- nbclassic==1.0.0

# gh-scoped-creds needs a newer version of git than what jammy provides
- git==2.45.1

# pymc3 needs this
- mkl-service=2.4.*

Expand Down
Loading