Merge pull request #5021 from berkeley-dsep-infra/staging

merging 5009/5020 to prod
berkeley-dsep-infra · Sep 11, 2023 · 7489244 · 7489244
2 parents 139c112 + 933a85f
commit 7489244
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/deployments/a11y/image/environment.yml b/deployments/a11y/image/environment.yml
@@ -22,6 +22,8 @@ dependencies:
 - websockify==0.11.0
 - pip==23.0.1
 - jupyterthemes==0.20.0
+- jupyterlab-accessible-themes==0.1.1  
+- jupyterlab_pygments==0.2.2
 - pip:
   #- -r infra-requirements.txt
   # Upgrade separate from what everyone else uses for now

diff --git a/deployments/datahub/images/default/environment.yml b/deployments/datahub/images/default/environment.yml
@@ -1,3 +1,7 @@
+# https://docs.conda.io/projects/conda-build/en/latest/resources/package-spec.html#examples
+# For conda, == is exact constraint, while = is fuzzy constraint.
+# pip uses https://peps.python.org/pep-0440/ which does not have =.
+
 dependencies:
 - nodejs=15.*
 - pip=22.2.*
@@ -77,8 +81,11 @@ dependencies:
 # Econ 148, Spring 2023 https://github.com/berkeley-dsep-infra/datahub/issues/4251
 - sqlalchemy==1.4.46
 
-# Econ 148, Spring 2023 https://github.com/berkeley-dsep-infra/datahub/issues/4093
+# UGBA88 Fall 2023, https://github.com/berkeley-dsep-infra/datahub/issues/5019
+- pymysql==1.1.0
+
 - pip:
+  # Econ 148, Spring 2023 https://github.com/berkeley-dsep-infra/datahub/issues/4093
   - pycountry-convert==0.7.2
   - otter-grader==4.2.0
   - gh-scoped-creds==4.1