[pull] master from 2i2c-org:master #526
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Updates the requirements on [ruamel-yaml]() to permit the latest version. --- updated-dependencies: - dependency-name: ruamel-yaml dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
Updates the requirements on [gspread](https://github.com/burnash/gspread) to permit the latest version. - [Release notes](https://github.com/burnash/gspread/releases) - [Changelog](https://github.com/burnash/gspread/blob/master/HISTORY.rst) - [Commits](burnash/gspread@v5.11.0...v5.12.0) --- updated-dependencies: - dependency-name: gspread dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
Brings in 2i2c-org/utoronto-r-image#11 Ref #3178
utoronto: Bump R image
Updates the requirements on [google-cloud-bigquery](https://github.com/googleapis/python-bigquery) to permit the latest version. - [Release notes](https://github.com/googleapis/python-bigquery/releases) - [Changelog](https://github.com/googleapis/python-bigquery/blob/main/CHANGELOG.md) - [Commits](googleapis/python-bigquery@v3.11.0...v3.13.0) --- updated-dependencies: - dependency-name: google-cloud-bigquery dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
…d together, otherwise pip install fails Do we need to specify both google-cloud-bigquery and google-cloud-bigquery[pandas] separately???
…gquery-eq-3.13.star
[CloudBank] LACC: Added Admin
cosmicds: Bump memory limit
Both the images in use at UCMerced don't have nbgitpuller installed in them, while the previous combined image did. I've been working on getting nbgitpuller into upstream jupyter docker-stacks (jupyter/docker-stacks#2000) for a while, but it looks like it'll take a bit longer. So I've temporarily created a repo (https://github.com/2i2c-org/scipy-notebook-with-nbgitpuller/) to use here. It's based on the same tag as before, but with nbgitpuller installed. We can get rid of this once nbgitpuller lands upstream. I have created https://github.com/2i2c-org/rocker-with-nbgitpuller/ to do the same for use with rocker. This too is a temporary repo. I hopefully will have a better longer term solution speced out next week. This unblocks ucmerced currently teaching. Ref https://2i2c.freshdesk.com/a/tickets/1089
This commit represents the simplest merge of a merge conflict.
Use images with nbgitpuller for UCMerced
basehub: make use of configurator opt-out
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )