Skip to content

Commit 88ad5a1

Browse files
humitoshumitos
authored
Requirements: unpin requests and docker (#11992)
They were pinned due to a bug, but it was fixed already. closes #11367
1 parent 53b977a commit 88ad5a1

File tree

5 files changed

+30
-53
lines changed

5 files changed

+30
-53
lines changed

‎requirements/deploy.txt

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ billiard==3.6.4.0
2828
# via
2929
# -r requirements/pip.txt
3030
# celery
31-
boto3==1.36.16
31+
boto3==1.36.17
3232
# via
3333
# -r requirements/pip.txt
3434
# django-storages
35-
botocore==1.36.16
35+
botocore==1.36.17
3636
# via
3737
# -r requirements/pip.txt
3838
# boto3
@@ -85,7 +85,7 @@ cron-descriptor==1.4.5
8585
# via
8686
# -r requirements/pip.txt
8787
# django-celery-beat
88-
cryptography==44.0.0
88+
cryptography==44.0.1
8989
# via
9090
# -r requirements/pip.txt
9191
# fido2
@@ -190,7 +190,7 @@ djangorestframework-jsonp==1.0.2
190190
# via -r requirements/pip.txt
191191
dnspython==2.7.0
192192
# via -r requirements/pip.txt
193-
docker==6.1.2
193+
docker==7.1.0
194194
# via -r requirements/pip.txt
195195
docutils==0.21.2
196196
# via -r requirements/pip.txt
@@ -260,7 +260,7 @@ lexid==2021.1006
260260
# via
261261
# -r requirements/pip.txt
262262
# bumpver
263-
lxml==5.3.0
263+
lxml==5.3.1
264264
# via
265265
# -r requirements/pip.txt
266266
# pyquery
@@ -282,7 +282,6 @@ packaging==24.2
282282
# via
283283
# -r requirements/pip.txt
284284
# djangorestframework-api-key
285-
# docker
286285
# dparse
287286
# gunicorn
288287
parso==0.8.4
@@ -362,7 +361,7 @@ redis==5.2.1
362361
# django-cacheops
363362
regex==2024.11.6
364363
# via -r requirements/pip.txt
365-
requests==2.30.0
364+
requests==2.32.3
366365
# via
367366
# -r requirements/pip.txt
368367
# django-allauth
@@ -471,16 +470,12 @@ vine==5.1.0
471470
# amqp
472471
# celery
473472
# kombu
474-
virtualenv==20.29.1
473+
virtualenv==20.29.2
475474
# via -r requirements/pip.txt
476475
wcwidth==0.2.13
477476
# via
478477
# -r requirements/pip.txt
479478
# prompt-toolkit
480-
websocket-client==1.8.0
481-
# via
482-
# -r requirements/pip.txt
483-
# docker
484479
xmlsec==1.3.14
485480
# via
486481
# -r requirements/pip.txt

‎requirements/docker.txt

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ billiard==3.6.4.0
3030
# via
3131
# -r requirements/pip.txt
3232
# celery
33-
boto3==1.36.16
33+
boto3==1.36.17
3434
# via
3535
# -r requirements/pip.txt
3636
# django-storages
37-
botocore==1.36.16
37+
botocore==1.36.17
3838
# via
3939
# -r requirements/pip.txt
4040
# boto3
@@ -91,7 +91,7 @@ cron-descriptor==1.4.5
9191
# via
9292
# -r requirements/pip.txt
9393
# django-celery-beat
94-
cryptography==44.0.0
94+
cryptography==44.0.1
9595
# via
9696
# -r requirements/pip.txt
9797
# fido2
@@ -200,7 +200,7 @@ djangorestframework-jsonp==1.0.2
200200
# via -r requirements/pip.txt
201201
dnspython==2.7.0
202202
# via -r requirements/pip.txt
203-
docker==6.1.2
203+
docker==7.1.0
204204
# via -r requirements/pip.txt
205205
docutils==0.21.2
206206
# via -r requirements/pip.txt
@@ -275,7 +275,7 @@ lexid==2021.1006
275275
# via
276276
# -r requirements/pip.txt
277277
# bumpver
278-
lxml==5.3.0
278+
lxml==5.3.1
279279
# via
280280
# -r requirements/pip.txt
281281
# pyquery
@@ -299,7 +299,6 @@ packaging==24.2
299299
# via
300300
# -r requirements/pip.txt
301301
# djangorestframework-api-key
302-
# docker
303302
# dparse
304303
# gunicorn
305304
# pyproject-api
@@ -392,7 +391,7 @@ redis==5.2.1
392391
# django-cacheops
393392
regex==2024.11.6
394393
# via -r requirements/pip.txt
395-
requests==2.30.0
394+
requests==2.32.3
396395
# via
397396
# -r requirements/pip.txt
398397
# django-allauth
@@ -504,18 +503,14 @@ vine==5.1.0
504503
# amqp
505504
# celery
506505
# kombu
507-
virtualenv==20.29.1
506+
virtualenv==20.29.2
508507
# via
509508
# -r requirements/pip.txt
510509
# tox
511510
wcwidth==0.2.13
512511
# via
513512
# -r requirements/pip.txt
514513
# prompt-toolkit
515-
websocket-client==1.8.0
516-
# via
517-
# -r requirements/pip.txt
518-
# docker
519514
wmctrl==0.5
520515
# via pdbpp
521516
xmlsec==1.3.14

‎requirements/pip.in

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ django-safemigrate
3838
# Impersonate users in the Django admin for support.
3939
django-impersonate
4040

41-
# The latest version of requests isn't compatible with the
42-
# version of the docker-py library we're using.
43-
# See https://github.com/docker/docker-py/issues/3256.
44-
requests==2.30.0
41+
requests
4542
requests-toolbelt
4643
slumber
4744
pyyaml
@@ -135,9 +132,7 @@ django-formtools
135132
# django.template.exceptions.TemplateDoesNotExist: bootstrap/field.html
136133
django-crispy-forms<2
137134

138-
# Force to upgrade to a version with a fix for socket timeouts
139-
# https://docker-py.readthedocs.io/en/stable/change-log.html#bugfixes
140-
docker==6.1.2
135+
docker
141136

142137
django-annoying
143138
djangorestframework-jsonp

‎requirements/pip.txt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ async-timeout==5.0.1
1717
# via redis
1818
billiard==3.6.4.0
1919
# via celery
20-
boto3==1.36.16
20+
boto3==1.36.17
2121
# via django-storages
22-
botocore==1.36.16
22+
botocore==1.36.17
2323
# via
2424
# boto3
2525
# s3transfer
@@ -54,7 +54,7 @@ colorama==0.4.6
5454
# via bumpver
5555
cron-descriptor==1.4.5
5656
# via django-celery-beat
57-
cryptography==44.0.0
57+
cryptography==44.0.1
5858
# via
5959
# fido2
6060
# pyjwt
@@ -150,7 +150,7 @@ djangorestframework-jsonp==1.0.2
150150
# via -r requirements/pip.in
151151
dnspython==2.7.0
152152
# via -r requirements/pip.in
153-
docker==6.1.2
153+
docker==7.1.0
154154
# via -r requirements/pip.in
155155
docutils==0.21.2
156156
# via -r requirements/pip.in
@@ -196,7 +196,7 @@ kombu==5.4.2
196196
# via celery
197197
lexid==2021.1006
198198
# via bumpver
199-
lxml==5.3.0
199+
lxml==5.3.1
200200
# via
201201
# pyquery
202202
# python3-saml
@@ -211,7 +211,6 @@ packaging==24.2
211211
# via
212212
# -r requirements/pip.in
213213
# djangorestframework-api-key
214-
# docker
215214
# dparse
216215
# gunicorn
217216
platformdirs==4.3.6
@@ -260,7 +259,7 @@ redis==5.2.1
260259
# django-cacheops
261260
regex==2024.11.6
262261
# via -r requirements/pip.in
263-
requests==2.30.0
262+
requests==2.32.3
264263
# via
265264
# -r requirements/pip.in
266265
# django-allauth
@@ -339,12 +338,10 @@ vine==5.1.0
339338
# amqp
340339
# celery
341340
# kombu
342-
virtualenv==20.29.1
341+
virtualenv==20.29.2
343342
# via -r requirements/pip.in
344343
wcwidth==0.2.13
345344
# via prompt-toolkit
346-
websocket-client==1.8.0
347-
# via docker
348345
xmlsec==1.3.14
349346
# via python3-saml
350347

‎requirements/testing.txt

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ billiard==3.6.4.0
3030
# via
3131
# -r requirements/pip.txt
3232
# celery
33-
boto3==1.36.16
33+
boto3==1.36.17
3434
# via
3535
# -r requirements/pip.txt
3636
# django-storages
37-
botocore==1.36.16
37+
botocore==1.36.17
3838
# via
3939
# -r requirements/pip.txt
4040
# boto3
@@ -88,7 +88,7 @@ cron-descriptor==1.4.5
8888
# via
8989
# -r requirements/pip.txt
9090
# django-celery-beat
91-
cryptography==44.0.0
91+
cryptography==44.0.1
9292
# via
9393
# -r requirements/pip.txt
9494
# fido2
@@ -197,7 +197,7 @@ djangorestframework-jsonp==1.0.2
197197
# via -r requirements/pip.txt
198198
dnspython==2.7.0
199199
# via -r requirements/pip.txt
200-
docker==6.1.2
200+
docker==7.1.0
201201
# via -r requirements/pip.txt
202202
docutils==0.21.2
203203
# via
@@ -269,7 +269,7 @@ lexid==2021.1006
269269
# via
270270
# -r requirements/pip.txt
271271
# bumpver
272-
lxml==5.3.0
272+
lxml==5.3.1
273273
# via
274274
# -r requirements/pip.txt
275275
# pyquery
@@ -289,7 +289,6 @@ packaging==24.2
289289
# via
290290
# -r requirements/pip.txt
291291
# djangorestframework-api-key
292-
# docker
293292
# dparse
294293
# gunicorn
295294
# pytest
@@ -380,7 +379,7 @@ redis==5.2.1
380379
# django-cacheops
381380
regex==2024.11.6
382381
# via -r requirements/pip.txt
383-
requests==2.30.0
382+
requests==2.32.3
384383
# via
385384
# -r requirements/pip.txt
386385
# django-allauth
@@ -500,16 +499,12 @@ vine==5.1.0
500499
# amqp
501500
# celery
502501
# kombu
503-
virtualenv==20.29.1
502+
virtualenv==20.29.2
504503
# via -r requirements/pip.txt
505504
wcwidth==0.2.13
506505
# via
507506
# -r requirements/pip.txt
508507
# prompt-toolkit
509-
websocket-client==1.8.0
510-
# via
511-
# -r requirements/pip.txt
512-
# docker
513508
xmlsec==1.3.14
514509
# via
515510
# -r requirements/pip.txt

0 commit comments

Comments
 (0)