Skip to content

Commit bd0cc80

Browse files
authored
Merge pull request #1827 from jupyterhub/update-image-requirements
binderhub image: refreeze requirements.txt
2 parents 7f8b6c3 + 4957764 commit bd0cc80

File tree

3 files changed

+48
-45
lines changed

3 files changed

+48
-45
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
171171
- name: Setup Python package dependencies
172172
run: |
173-
pip install -r dev-requirements.txt -r helm-chart/images/binderhub/requirements.txt
173+
pip install --no-binary pycurl -r dev-requirements.txt -r helm-chart/images/binderhub/requirements.txt
174174
pip install -e .
175175
176176
- name: Install JupyterHub chart for main tests

helm-chart/images/binderhub/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ COPY helm-chart/images/binderhub/requirements.txt ./
2222
COPY dist .
2323
ARG PIP_CACHE_DIR=/tmp/pip-cache
2424
RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
25-
pip install build \
26-
&& pip wheel --wheel-dir=/tmp/wheels \
25+
pip wheel --wheel-dir=/tmp/wheels \
26+
# pycurl wheels for 7.45.3 have problems finding CAs
27+
# https://github.com/pycurl/pycurl/issues/834
28+
--no-binary pycurl \
2729
-r ./requirements.txt \
2830
./binderhub*.whl
2931

helm-chart/images/binderhub/requirements.txt

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ attrs==23.2.0
1212
# via
1313
# jsonschema
1414
# referencing
15-
cachetools==5.3.2
15+
cachetools==5.3.3
1616
# via google-auth
17-
certifi==2023.11.17
17+
certifi==2024.2.2
1818
# via
1919
# kubernetes
2020
# requests
@@ -24,32 +24,33 @@ cffi==1.16.0
2424
# via cryptography
2525
charset-normalizer==3.3.2
2626
# via requests
27-
cryptography==42.0.4
27+
cryptography==42.0.5
2828
# via pyopenssl
2929
docker==7.0.0
30-
# via -r ../../../requirements.txt
30+
# via -r helm-chart/images/binderhub/../../../requirements.txt
3131
escapism==1.0.1
32-
# via -r ../../../requirements.txt
33-
google-api-core[grpc]==2.16.1
32+
# via -r helm-chart/images/binderhub/../../../requirements.txt
33+
google-api-core[grpc]==2.17.1
3434
# via
35-
# google-api-core
3635
# google-cloud-appengine-logging
3736
# google-cloud-core
3837
# google-cloud-logging
39-
google-auth==2.27.0
38+
google-auth==2.29.0
4039
# via
4140
# google-api-core
41+
# google-cloud-appengine-logging
4242
# google-cloud-core
43+
# google-cloud-logging
4344
# kubernetes
44-
google-cloud-appengine-logging==1.4.0
45+
google-cloud-appengine-logging==1.4.3
4546
# via google-cloud-logging
4647
google-cloud-audit-log==0.2.5
4748
# via google-cloud-logging
4849
google-cloud-core==2.4.1
4950
# via google-cloud-logging
50-
google-cloud-logging==3.9.0
51-
# via -r requirements.in
52-
googleapis-common-protos[grpc]==1.62.0
51+
google-cloud-logging==3.10.0
52+
# via -r helm-chart/images/binderhub/requirements.in
53+
googleapis-common-protos[grpc]==1.63.0
5354
# via
5455
# google-api-core
5556
# google-cloud-audit-log
@@ -59,61 +60,61 @@ greenlet==3.0.3
5960
# via sqlalchemy
6061
grpc-google-iam-v1==0.13.0
6162
# via google-cloud-logging
62-
grpcio==1.60.0
63+
grpcio==1.62.1
6364
# via
6465
# google-api-core
6566
# googleapis-common-protos
6667
# grpc-google-iam-v1
6768
# grpcio-status
68-
grpcio-status==1.60.0
69+
grpcio-status==1.62.1
6970
# via google-api-core
7071
idna==3.6
7172
# via requests
7273
jinja2==3.1.3
7374
# via
74-
# -r ../../../requirements.txt
75+
# -r helm-chart/images/binderhub/../../../requirements.txt
7576
# jupyterhub
7677
jsonschema==4.21.1
7778
# via
78-
# -r ../../../requirements.txt
79+
# -r helm-chart/images/binderhub/../../../requirements.txt
7980
# jupyter-telemetry
8081
jsonschema-specifications==2023.12.1
8182
# via jsonschema
8283
jupyter-telemetry==0.1.0
8384
# via jupyterhub
84-
jupyterhub==4.0.2
85+
jupyterhub==4.1.0
8586
# via
86-
# -r ../../../requirements.txt
87-
# -r requirements.in
87+
# -r helm-chart/images/binderhub/../../../requirements.txt
88+
# -r helm-chart/images/binderhub/requirements.in
8889
kubernetes==9.0.1
8990
# via
90-
# -r ../../../requirements.txt
91-
# -r requirements.in
91+
# -r helm-chart/images/binderhub/../../../requirements.txt
92+
# -r helm-chart/images/binderhub/requirements.in
9293
mako==1.3.2
9394
# via alembic
94-
markupsafe==2.1.4
95+
markupsafe==2.1.5
9596
# via
9697
# jinja2
9798
# mako
9899
oauthlib==3.2.2
99100
# via
100101
# jupyterhub
101102
# requests-oauthlib
102-
packaging==23.2
103+
packaging==24.0
103104
# via
104105
# docker
105106
# jupyterhub
106107
pamela==1.1.0
107108
# via jupyterhub
108-
prometheus-client==0.19.0
109+
prometheus-client==0.20.0
109110
# via
110-
# -r ../../../requirements.txt
111+
# -r helm-chart/images/binderhub/../../../requirements.txt
111112
# jupyterhub
112113
proto-plus==1.23.0
113114
# via
114115
# google-cloud-appengine-logging
115116
# google-cloud-logging
116-
protobuf==4.25.2
117+
protobuf==4.25.3
117118
# via
118119
# google-api-core
119120
# google-cloud-appengine-logging
@@ -131,23 +132,23 @@ pyasn1-modules==0.3.0
131132
# via google-auth
132133
pycparser==2.21
133134
# via cffi
134-
pycurl==7.45.2
135-
# via -r requirements.in
135+
pycurl==7.45.3
136+
# via -r helm-chart/images/binderhub/requirements.in
136137
pyjwt==2.8.0
137-
# via -r ../../../requirements.txt
138-
pyopenssl==24.0.0
138+
# via -r helm-chart/images/binderhub/../../../requirements.txt
139+
pyopenssl==24.1.0
139140
# via certipy
140-
python-dateutil==2.8.2
141+
python-dateutil==2.9.0.post0
141142
# via
142143
# jupyterhub
143144
# kubernetes
144145
python-json-logger==2.0.7
145146
# via
146-
# -r ../../../requirements.txt
147+
# -r helm-chart/images/binderhub/../../../requirements.txt
147148
# jupyter-telemetry
148149
pyyaml==6.0.1
149150
# via kubernetes
150-
referencing==0.33.0
151+
referencing==0.34.0
151152
# via
152153
# jsonschema
153154
# jsonschema-specifications
@@ -158,40 +159,40 @@ requests==2.31.0
158159
# jupyterhub
159160
# kubernetes
160161
# requests-oauthlib
161-
requests-oauthlib==1.3.1
162+
requests-oauthlib==1.4.0
162163
# via kubernetes
163-
rpds-py==0.17.1
164+
rpds-py==0.18.0
164165
# via
165166
# jsonschema
166167
# referencing
167168
rsa==4.9
168169
# via google-auth
169-
ruamel-yaml==0.18.5
170+
ruamel-yaml==0.18.6
170171
# via jupyter-telemetry
171172
ruamel-yaml-clib==0.2.8
172173
# via ruamel-yaml
173174
six==1.16.0
174175
# via
175176
# kubernetes
176177
# python-dateutil
177-
sqlalchemy==2.0.25
178+
sqlalchemy==2.0.28
178179
# via
179180
# alembic
180181
# jupyterhub
181182
tornado==6.4
182183
# via
183-
# -r ../../../requirements.txt
184+
# -r helm-chart/images/binderhub/../../../requirements.txt
184185
# jupyterhub
185-
traitlets==5.14.1
186+
traitlets==5.14.2
186187
# via
187-
# -r ../../../requirements.txt
188+
# -r helm-chart/images/binderhub/../../../requirements.txt
188189
# jupyter-telemetry
189190
# jupyterhub
190-
typing-extensions==4.9.0
191+
typing-extensions==4.10.0
191192
# via
192193
# alembic
193194
# sqlalchemy
194-
urllib3==2.2.0
195+
urllib3==2.2.1
195196
# via
196197
# docker
197198
# kubernetes

0 commit comments

Comments
 (0)