Skip to content

Commit 4aee1fd

Browse files
committed
binderhub image: refreeze dependencies with JH 1.2.* and kubernetes 12.*
1 parent 6151015 commit 4aee1fd

File tree

3 files changed

+29
-27
lines changed

3 files changed

+29
-27
lines changed
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
dependencies:
2-
- name: jupyterhub
3-
version: "0.10.2"
4-
repository: "https://jupyterhub.github.io/helm-chart"
2+
# https://github.com/jupyterhub/zero-to-jupyterhub-k8s/tags
3+
- name: jupyterhub
4+
version: "0.10.6"
5+
repository: "https://jupyterhub.github.io/helm-chart"

helm-chart/images/binderhub/requirements.in

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
#
44
# ./dependencies freeze --upgrade
55
#
6-
google-cloud-logging
6+
# FIXME: google-cloud-logging was pinned to avoid introducing a potentially
7+
# breaking change as major version 2 was recently released. See:
8+
# https://github.com/googleapis/python-logging/blob/master/UPGRADING.md
9+
google-cloud-logging==1.*
710

8-
# pins for our image
9-
# kubernetes is pinned to 9 because we have observed a performance issue in 12
10-
# where listing pods took ~6s instead of ~1s
11-
kubernetes==9.*
12-
# jupyterhub is pinned to match the JupyterHub Helm chart's version of jupyterhub
13-
jupyterhub==1.1.*
11+
# jupyterhub and kubernetes is pinned to match the JupyterHub Helm chart's
12+
# version of jupyterhub
13+
jupyterhub==1.2.*
14+
kubernetes==12.*

helm-chart/images/binderhub/requirements.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,51 @@
77
alembic==1.4.3 # via jupyterhub
88
async-generator==1.10 # via jupyterhub
99
attrs==20.3.0 # via jsonschema
10-
cachetools==4.1.1 # via google-auth
11-
certifi==2020.11.8 # via kubernetes, requests
10+
cachetools==4.2.0 # via google-auth
11+
certifi==2020.12.5 # via kubernetes, requests
1212
certipy==0.1.3 # via jupyterhub
13-
cffi==1.14.3 # via cryptography
14-
chardet==3.0.4 # via requests
15-
cryptography==3.2.1 # via pyopenssl
16-
docker==4.3.1 # via -r binderhub.in
13+
cffi==1.14.4 # via cryptography
14+
chardet==4.0.0 # via requests
15+
cryptography==3.3.1 # via pyopenssl
16+
docker==4.4.0 # via -r binderhub.in
1717
entrypoints==0.3 # via jupyterhub
1818
escapism==1.0.1 # via -r binderhub.in
19-
google-api-core[grpc]==1.23.0 # via google-cloud-core, google-cloud-logging
20-
google-auth==1.23.0 # via google-api-core, kubernetes
21-
google-cloud-core==1.4.3 # via google-cloud-logging
19+
google-api-core[grpc]==1.24.1 # via google-cloud-core, google-cloud-logging
20+
google-auth==1.24.0 # via google-api-core, kubernetes
21+
google-cloud-core==1.5.0 # via google-cloud-logging
2222
google-cloud-logging==1.15.1 # via -r requirements.in
2323
googleapis-common-protos==1.52.0 # via google-api-core
24-
grpcio==1.33.2 # via google-api-core
24+
grpcio==1.34.0 # via google-api-core
2525
idna==2.10 # via requests
2626
ipython-genutils==0.2.0 # via traitlets
2727
jinja2==2.11.2 # via -r binderhub.in, jupyterhub
2828
jsonschema==3.2.0 # via -r binderhub.in, jupyter-telemetry
2929
jupyter-telemetry==0.1.0 # via jupyterhub
30-
jupyterhub==1.1.0 # via -r binderhub.in, -r requirements.in
31-
kubernetes==9.0.1 # via -r binderhub.in, -r requirements.in
30+
jupyterhub==1.2.2 # via -r binderhub.in, -r requirements.in
31+
kubernetes==12.0.1 # via -r binderhub.in, -r requirements.in
3232
mako==1.1.3 # via alembic
3333
markupsafe==1.1.1 # via jinja2, mako
3434
oauthlib==3.1.0 # via jupyterhub, requests-oauthlib
3535
pamela==1.0.0 # via jupyterhub
36-
prometheus-client==0.8.0 # via -r binderhub.in, jupyterhub
36+
prometheus-client==0.9.0 # via -r binderhub.in, jupyterhub
3737
protobuf==3.14.0 # via google-api-core, googleapis-common-protos
3838
pyasn1-modules==0.2.8 # via google-auth
3939
pyasn1==0.4.8 # via pyasn1-modules, rsa
4040
pycparser==2.20 # via cffi
41-
pyopenssl==19.1.0 # via certipy
41+
pyopenssl==20.0.1 # via certipy
4242
pyrsistent==0.17.3 # via jsonschema
4343
python-dateutil==2.8.1 # via alembic, jupyterhub, kubernetes
4444
python-editor==1.0.4 # via alembic
4545
python-json-logger==2.0.1 # via -r binderhub.in, jupyter-telemetry
4646
pytz==2020.4 # via google-api-core
4747
pyyaml==5.3.1 # via kubernetes
4848
requests-oauthlib==1.3.0 # via kubernetes
49-
requests==2.25.0 # via docker, google-api-core, jupyterhub, kubernetes, requests-oauthlib
49+
requests==2.25.1 # via docker, google-api-core, jupyterhub, kubernetes, requests-oauthlib
5050
rsa==4.6 # via google-auth
5151
ruamel.yaml.clib==0.2.2 # via ruamel.yaml
5252
ruamel.yaml==0.16.12 # via jupyter-telemetry
53-
six==1.15.0 # via cryptography, docker, google-api-core, google-auth, grpcio, jsonschema, kubernetes, protobuf, pyopenssl, python-dateutil, websocket-client
54-
sqlalchemy==1.3.20 # via alembic, jupyterhub
53+
six==1.15.0 # via cryptography, docker, google-api-core, google-auth, google-cloud-core, grpcio, jsonschema, kubernetes, protobuf, pyopenssl, python-dateutil, websocket-client
54+
sqlalchemy==1.3.22 # via alembic, jupyterhub
5555
tornado==6.1 # via -r binderhub.in, jupyterhub
5656
traitlets==5.0.5 # via -r binderhub.in, jupyter-telemetry, jupyterhub
5757
urllib3==1.26.2 # via kubernetes, requests

0 commit comments

Comments
 (0)