Merge pull request #5502 from shaneknapp/pol-sci

packages for pol sci 3
berkeley-dsep-infra · Feb 2, 2024 · fabe643 · fabe643
2 parents c33292d + 316fbbb
commit fabe643
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/deployments/datahub/images/default/Dockerfile b/deployments/datahub/images/default/Dockerfile
@@ -118,6 +118,12 @@ COPY r-packages/2023-fall-mba-247.r /tmp/r-packages/
 RUN echo "/usr/bin/r /tmp/r-packages/2023-fall-mba-247.r" | /usr/bin/time -f "User\t%U\nSys\t%S\nReal\t%E\nCPU\t%P" /usr/bin/bash
 RUN rm -rf /tmp/downloaded_packages
 
+# POL SCI 3, SP 24
+# https://github.com/berkeley-dsep-infra/datahub/issues/5496
+COPY r-packages/2024-sp-polsci-3.r /tmp/r-packages/
+RUN echo "/usr/bin/r /tmp/r-packages/2024-sp-polsci-3.r" | /usr/bin/time -f "User\t%U\nSys\t%S\nReal\t%E\nCPU\t%P" /usr/bin/bash
+RUN rm -rf /tmp/downloaded_packages
+
 ENV PATH ${CONDA_DIR}/bin:$PATH:/usr/lib/rstudio-server/bin
 
 # Set this to be on container storage, rather than under $HOME ENV IPYTHONDIR ${CONDA_DIR}/etc/ipython

diff --git a/deployments/datahub/images/default/environment.yml b/deployments/datahub/images/default/environment.yml
@@ -195,5 +195,8 @@ dependencies:
   # Engineering 7 https://github.com/berkeley-dsep-infra/datahub/issues/5337
   - otter-grader==4.4.1
 
-   # Stat 165/265 requires prophet, Spring, 2024
+  # Stat 165/265 requires prophet, Spring, 2024
   - prophet==1.1.5
+
+  # https://github.com/berkeley-dsep-infra/datahub/issues/5497
+  - ottr-force-save-labextension==0.1.1
diff --git a/deployments/datahub/images/default/install.R b/deployments/datahub/images/default/install.R
@@ -7,7 +7,8 @@ source("/tmp/class-libs.R")
 
 # install ottr, needs to go first issue #3216
 # install ottr, 1.4.0, issue #5314
-devtools::install_version("ottr", version = "1.4.0", repos = "https://cran.r-project.org", upgrade = "never", quiet = FALSE)
+# install ottr, 1.5.0 https://github.com/berkeley-dsep-infra/datahub/issues/5498
+devtools::install_version("ottr", version = "1.5.0", repos = "https://cran.r-project.org", upgrade = "never", quiet = FALSE)
 
 # dplyr package + backends
 # From https://github.com/rocker-org/rocker-versioned2/blob/b8d23396468c5dc73115cce6c5716424d80ffcb0/scripts/install_tidyverse.sh#L30

diff --git a/deployments/datahub/images/default/r-packages/2024-sp-polsci-3.r b/deployments/datahub/images/default/r-packages/2024-sp-polsci-3.r
@@ -0,0 +1,17 @@
+#!/usr/bin/env Rscript
+# From https://github.com/berkeley-dsep-infra/datahub/issues/5496
+# pol sci 3, spring 2024 and into the future
+
+print("Installing packages for POL SCI 3")
+
+source("/tmp/class-libs.R")
+
+class_name="POL SCI 3"
+class_libs = c(
+    "estimatr", "1.0.2"
+)
+
+class_libs_install_version(class_name, class_libs)
+
+print("Done installing packages for POL SCI 3")
+