Skip to content

Commit

Permalink
Merge pull request #5087 from berkeley-dsep-infra/staging
Browse files Browse the repository at this point in the history
merging 5082/5083/5084/5086 to prod
  • Loading branch information
shaneknapp authored Sep 28, 2023
2 parents 491a4ce + b90a5e1 commit ef30693
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 5 deletions.
4 changes: 3 additions & 1 deletion deployments/data102/image/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ channels:
- conda-forge

dependencies:
- python==3.11.0
- python==3.11.3
- git==2.39.1
- bambi==0.12.0
- graphviz==8.0.3
- jupyter-resource-usage==1.0.0
- jupyterlab==4.0.4
Expand All @@ -27,6 +28,7 @@ dependencies:
- pandoc==3.1.3
# data102, Fall 2023, https://github.com/berkeley-dsep-infra/datahub/issues/5037
- pymc==5.8.1
- python-graphviz==0.20.1
- scikit-learn==1.2.2
- scipy==1.10.1
- seaborn==0.12.2
Expand Down
7 changes: 7 additions & 0 deletions deployments/datahub/images/default/apt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,10 @@ libzmq5
# MUSIC 30: musescore3
# https://github.com/berkeley-dsep-infra/datahub/issues/5047
musescore3

# additional R packages
# https://github.com/berkeley-dsep-infra/datahub/issues/5061
libgdal-dev
libgeos-dev
libproj-dev
libmysqlclient-dev
2 changes: 1 addition & 1 deletion hub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v1
appVersion: '1.0'
description: Deployment Chart for JupyterHub
name: hub
version: 0.0.1-0.dev.git.6820.hf9ad98e4
version: 0.0.1-0.dev.git.6847.h37aa9975
2 changes: 1 addition & 1 deletion hub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ jupyterhub:
# Generated by chartpress
image:
name: gcr.io/ucb-datahub-2018/jupyterhub-hub
tag: '0.0.1-0.dev.git.6820.hf9ad98e4'
tag: '0.0.1-0.dev.git.6847.h37aa9975'
networkPolicy:
enabled: true
ingress:
Expand Down
2 changes: 1 addition & 1 deletion images/hub/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ USER root

RUN python3 -m pip install --no-cache git+https://github.com/berkeley-dsep-infra/canvasoauthenticator@09e7ed8
RUN python3 -m pip install --no-cache jupyterhub-ltiauthenticator==1.5.1
RUN python3 -m pip install --no-cache git+https://github.com/jupyterhub/kubespawner@main
RUN python3 -m pip install --no-cache git+https://github.com/jupyterhub/kubespawner@6.1.0

COPY logos /srv/logos

Expand Down
2 changes: 1 addition & 1 deletion node-placeholder/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.1-0.dev.git.6680.h8e8b5161
version: 0.0.1-0.dev.git.6821.hfab4a361

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down

0 comments on commit ef30693

Please sign in to comment.