From 95ed40f319f29485e18fd5c77694cb1c8744a3a5 Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Tue, 20 Aug 2024 11:30:03 -0700 Subject: [PATCH 1/4] Removing jupyterlab-myst extension from datahub image --- deployments/datahub/images/default/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/datahub/images/default/environment.yml b/deployments/datahub/images/default/environment.yml index 9d5aa9aa2..9ec51db74 100644 --- a/deployments/datahub/images/default/environment.yml +++ b/deployments/datahub/images/default/environment.yml @@ -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 # ATTEMPT TO PUT NEW PACKAGES IN THE CONDA LIST ABOVE FIRST, RATHER THAN PIP From 0d000a0a3d72303d64bc619b0bba88ad3a0544a5 Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Tue, 20 Aug 2024 11:32:04 -0700 Subject: [PATCH 2/4] Fixing comment --- deployments/datahub/images/default/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/datahub/images/default/environment.yml b/deployments/datahub/images/default/environment.yml index 9ec51db74..3dcec245a 100644 --- a/deployments/datahub/images/default/environment.yml +++ b/deployments/datahub/images/default/environment.yml @@ -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 (Causing issues with rendering of the latex output + # - 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 From b64da2199af8ce16e35d1209eaf0e70fd6c41de6 Mon Sep 17 00:00:00 2001 From: Jonathan Felder Date: Tue, 20 Aug 2024 13:49:06 -0700 Subject: [PATCH 3/4] [DH-359] bumping seaborn --- deployments/datahub/config/common.yaml | 4 ++-- deployments/datahub/images/default/environment.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml index 8aff4a141..91206c55f 100644 --- a/deployments/datahub/config/common.yaml +++ b/deployments/datahub/config/common.yaml @@ -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: diff --git a/deployments/datahub/images/default/environment.yml b/deployments/datahub/images/default/environment.yml index 9d5aa9aa2..5dccbbb18 100644 --- a/deployments/datahub/images/default/environment.yml +++ b/deployments/datahub/images/default/environment.yml @@ -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.* From 7f0c3389eda5b36f6eaf63dc34c4045a3da20b37 Mon Sep 17 00:00:00 2001 From: Ryan Lovett Date: Tue, 20 Aug 2024 14:36:19 -0700 Subject: [PATCH 4/4] Add missing braces around action conditional. --- .github/workflows/quarto-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/quarto-docs.yml b/.github/workflows/quarto-docs.yml index 2b74a334f..8f903f041 100644 --- a/.github/workflows/quarto-docs.yml +++ b/.github/workflows/quarto-docs.yml @@ -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