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 5009/5020 to prod #5021

Merged
merged 5 commits into from
Sep 11, 2023
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: 2 additions & 0 deletions deployments/a11y/image/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 8 additions & 1 deletion deployments/datahub/images/default/environment.yml
Original file line number Diff line number Diff line change
@@ -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.*
Expand Down Expand Up @@ -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