Skip to content

Commit 2607824

Browse files
sandereggsanderegg
authored
⬆️Maintenance: upgraded aioboto3 (#6009)
1 parent 1a97db7 commit 2607824

File tree

20 files changed

+425
-109
lines changed

20 files changed

+425
-109
lines changed

‎packages/aws-library/requirements/_base.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
aio-pika==9.4.1
22
# via -r requirements/../../../packages/service-library/requirements/_base.in
3-
aioboto3==12.4.0
3+
aioboto3==13.1.0
44
# via -r requirements/_base.in
5-
aiobotocore==2.12.3
5+
aiobotocore==2.13.1
66
# via aioboto3
77
aiocache==0.12.2
88
# via -r requirements/_base.in
@@ -11,7 +11,9 @@ aiodebug==2.3.0
1111
aiodocker==0.21.0
1212
# via -r requirements/../../../packages/service-library/requirements/_base.in
1313
aiofiles==23.2.1
14-
# via -r requirements/../../../packages/service-library/requirements/_base.in
14+
# via
15+
# -r requirements/../../../packages/service-library/requirements/_base.in
16+
# aioboto3
1517
aiohttp==3.9.5
1618
# via
1719
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
@@ -46,9 +48,9 @@ attrs==23.2.0
4648
# aiohttp
4749
# jsonschema
4850
# referencing
49-
boto3==1.34.69
51+
boto3==1.34.131
5052
# via aiobotocore
51-
botocore==1.34.69
53+
botocore==1.34.131
5254
# via
5355
# aiobotocore
5456
# boto3

‎packages/aws-library/requirements/_test.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ aws-xray-sdk==2.13.0
1313
# via moto
1414
blinker==1.8.1
1515
# via flask
16-
boto3==1.34.69
16+
boto3==1.34.131
1717
# via
1818
# -c requirements/_base.txt
1919
# aws-sam-translator
2020
# moto
21-
botocore==1.34.69
21+
botocore==1.34.131
2222
# via
2323
# -c requirements/_base.txt
2424
# aws-xray-sdk

‎packages/aws-library/tests/test_s3_client.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,8 @@ async def test_copy_file_invalid_raises(
10621062
file = create_file_of_size(parse_obj_as(ByteSize, "1MiB"))
10631063
uploaded_file = await upload_file(file)
10641064
dst_object_key = faker.file_name()
1065-
with pytest.raises(S3BucketInvalidError, match=f"{non_existing_s3_bucket}"):
1065+
# NOTE: since aioboto3 13.1.0 this raises S3KeyNotFoundError instead of S3BucketInvalidError
1066+
with pytest.raises(S3KeyNotFoundError, match=f"{non_existing_s3_bucket}"):
10661067
await simcore_s3_api.copy_object(
10671068
bucket=non_existing_s3_bucket,
10681069
src_object_key=uploaded_file.s3_key,

‎packages/simcore-sdk/requirements/_test.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
aioboto3==9.6.0
2-
# via
3-
# -c requirements/./constraints.txt
4-
# -r requirements/_test.in
5-
aiobotocore==2.3.0
1+
aioboto3==13.1.0
2+
# via -r requirements/_test.in
3+
aiobotocore==2.13.1
64
# via aioboto3
5+
aiofiles==23.2.1
6+
# via
7+
# -c requirements/_base.txt
8+
# aioboto3
79
aiohttp==3.9.5
810
# via
911
# -c requirements/../../../requirements/constraints.txt
@@ -42,13 +44,12 @@ aws-xray-sdk==2.13.0
4244
# via moto
4345
blinker==1.8.1
4446
# via flask
45-
boto3==1.21.21
47+
boto3==1.34.131
4648
# via
47-
# -c requirements/./constraints.txt
4849
# aiobotocore
4950
# aws-sam-translator
5051
# moto
51-
botocore==1.24.21
52+
botocore==1.34.131
5253
# via
5354
# aiobotocore
5455
# aws-xray-sdk
@@ -286,7 +287,7 @@ rpds-py==0.18.0
286287
# -c requirements/_base.txt
287288
# jsonschema
288289
# referencing
289-
s3transfer==0.5.2
290+
s3transfer==0.10.2
290291
# via boto3
291292
sarif-om==1.0.4
292293
# via cfn-lint

‎packages/simcore-sdk/requirements/constraints.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +0,0 @@
1-
# There are incompatible versions in the resolved dependencies:
2-
# boto3==1.21.21 (from -c requirements/./constraints.txt (line 3))
3-
# boto3<1.24.60,>=1.24.59 (from aiobotocore[boto3]==2.4.0->aioboto3==10.1.0->-r requirements/_test.in (line 13))
4-
# boto3>=1.9.201 (from moto[server]==4.0.1->-r requirements/_test.in (line 18))
5-
aioboto3<=9.6.0
6-
# There are incompatible versions in the resolved dependencies:
7-
# botocore>=1.12.201 (from moto[server]==4.0.1->-r requirements/_test.in (line 18))
8-
# botocore>=1.11.3 (from aws-xray-sdk==2.10.0->moto[server]==4.0.1->-r requirements/_test.in (line 18))
9-
# botocore<1.28.0,>=1.27.95 (from boto3==1.24.95->moto[server]==4.0.1->-r requirements/_test.in (line 18))
10-
# botocore<1.24.22,>=1.24.21 (from aiobotocore[boto3]==2.3.0->aioboto3==9.6.0->-r requirements/_test.in (line 13))
11-
boto3<=1.21.21

‎services/agent/requirements/_test.txt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
aioboto3==9.6.0
2-
# via
3-
# -c requirements/./constraints.txt
4-
# -r requirements/_test.in
5-
aiobotocore==2.3.0
1+
aioboto3==12.4.0
2+
# via -r requirements/_test.in
3+
aiobotocore==2.12.3
64
# via aioboto3
75
aiohttp==3.8.5
86
# via
@@ -36,13 +34,12 @@ aws-xray-sdk==2.13.0
3634
# via moto
3735
blinker==1.8.1
3836
# via flask
39-
boto3==1.21.21
37+
boto3==1.34.69
4038
# via
41-
# -c requirements/./constraints.txt
4239
# aiobotocore
4340
# aws-sam-translator
4441
# moto
45-
botocore==1.24.21
42+
botocore==1.34.69
4643
# via
4744
# aiobotocore
4845
# aws-xray-sdk
@@ -249,7 +246,7 @@ rsa==4.9
249246
# via
250247
# -c requirements/../../../requirements/constraints.txt
251248
# python-jose
252-
s3transfer==0.5.2
249+
s3transfer==0.10.2
253250
# via boto3
254251
sarif-om==1.0.4
255252
# via cfn-lint

‎services/agent/requirements/constraints.txt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,6 @@
33
# CONSTRAINTS DUE TO TEST LIBRARIES
44
#
55

6-
#
7-
# BELOW COSNTRAINTS are required to install moto[server]
8-
#
9-
10-
# There are incompatible versions in the resolved dependencies:
11-
# boto3==1.21.21 (from -c requirements/./constraints.txt (line 3))
12-
# boto3<1.24.60,>=1.24.59 (from aiobotocore[boto3]==2.4.0->aioboto3==10.1.0->-r requirements/_test.in (line 13))
13-
# boto3>=1.9.201 (from moto[server]==4.0.1->-r requirements/_test.in (line 18))
14-
aioboto3<=9.6.0
15-
# There are incompatible versions in the resolved dependencies:
16-
# botocore>=1.12.201 (from moto[server]==4.0.1->-r requirements/_test.in (line 18))
17-
# botocore>=1.11.3 (from aws-xray-sdk==2.10.0->moto[server]==4.0.1->-r requirements/_test.in (line 18))
18-
# botocore<1.28.0,>=1.27.95 (from boto3==1.24.95->moto[server]==4.0.1->-r requirements/_test.in (line 18))
19-
# botocore<1.24.22,>=1.24.21 (from aiobotocore[boto3]==2.3.0->aioboto3==9.6.0->-r requirements/_test.in (line 13))
20-
boto3<=1.21.21
216
# There are incompatible versions in the resolved dependencies:
227
# jsonschema==3.2.0 (from -c requirements/_base.txt (line 159))
238
# jsonschema~=3.2 (from -c requirements/./constraints.txt (line 12))

‎services/autoscaling/requirements/_base.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ aio-pika==9.4.1
33
# -c requirements/../../../packages/service-library/requirements/./_base.in
44
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
55
# -r requirements/../../../packages/service-library/requirements/_base.in
6-
aioboto3==12.4.0
6+
aioboto3==13.1.0
77
# via -r requirements/../../../packages/aws-library/requirements/_base.in
8-
aiobotocore==2.12.3
8+
aiobotocore==2.13.1
99
# via aioboto3
1010
aiocache==0.12.2
1111
# via
@@ -27,6 +27,7 @@ aiofiles==23.2.1
2727
# -c requirements/../../../packages/service-library/requirements/./_base.in
2828
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
2929
# -r requirements/../../../packages/service-library/requirements/_base.in
30+
# aioboto3
3031
aiohttp==3.9.5
3132
# via
3233
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
@@ -74,9 +75,9 @@ attrs==23.2.0
7475
# aiohttp
7576
# jsonschema
7677
# referencing
77-
boto3==1.34.69
78+
boto3==1.34.131
7879
# via aiobotocore
79-
botocore==1.34.69
80+
botocore==1.34.131
8081
# via
8182
# aiobotocore
8283
# boto3

‎services/autoscaling/requirements/_test.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ aws-xray-sdk==2.13.1
2323
# via moto
2424
blinker==1.8.2
2525
# via flask
26-
boto3==1.34.69
26+
boto3==1.34.131
2727
# via
2828
# -c requirements/_base.txt
2929
# aws-sam-translator
3030
# moto
31-
botocore==1.34.69
31+
botocore==1.34.131
3232
# via
3333
# -c requirements/_base.txt
3434
# aws-xray-sdk

‎services/clusters-keeper/requirements/_base.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ aio-pika==9.4.1
33
# -c requirements/../../../packages/service-library/requirements/./_base.in
44
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
55
# -r requirements/../../../packages/service-library/requirements/_base.in
6-
aioboto3==12.4.0
6+
aioboto3==13.1.0
77
# via -r requirements/../../../packages/aws-library/requirements/_base.in
8-
aiobotocore==2.12.3
8+
aiobotocore==2.13.1
99
# via aioboto3
1010
aiocache==0.12.2
1111
# via -r requirements/../../../packages/aws-library/requirements/_base.in
@@ -24,6 +24,7 @@ aiofiles==23.2.1
2424
# -c requirements/../../../packages/service-library/requirements/./_base.in
2525
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
2626
# -r requirements/../../../packages/service-library/requirements/_base.in
27+
# aioboto3
2728
aiohttp==3.9.5
2829
# via
2930
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
@@ -71,9 +72,9 @@ attrs==23.2.0
7172
# aiohttp
7273
# jsonschema
7374
# referencing
74-
boto3==1.34.69
75+
boto3==1.34.131
7576
# via aiobotocore
76-
botocore==1.34.69
77+
botocore==1.34.131
7778
# via
7879
# aiobotocore
7980
# boto3

‎services/clusters-keeper/requirements/_test.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ aws-xray-sdk==2.13.1
3838
# via moto
3939
blinker==1.8.2
4040
# via flask
41-
boto3==1.34.69
41+
boto3==1.34.131
4242
# via
4343
# -c requirements/_base.txt
4444
# aws-sam-translator
4545
# moto
46-
botocore==1.34.69
46+
botocore==1.34.131
4747
# via
4848
# -c requirements/_base.txt
4949
# aws-xray-sdk

‎services/director-v2/requirements/_test.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@ aio-pika==9.4.1
22
# via
33
# -c requirements/_base.txt
44
# -r requirements/_test.in
5-
aioboto3==12.4.0
5+
aioboto3==13.1.0
66
# via -r requirements/_test.in
7-
aiobotocore==2.12.3
7+
aiobotocore==2.13.1
88
# via aioboto3
9+
aiofiles==23.2.1
10+
# via
11+
# -c requirements/_base.txt
12+
# aioboto3
913
aiohttp==3.9.5
1014
# via
1115
# -c requirements/../../../requirements/constraints.txt
@@ -45,9 +49,9 @@ attrs==23.2.0
4549
# pytest-docker
4650
bokeh==3.4.1
4751
# via dask
48-
boto3==1.34.69
52+
boto3==1.34.131
4953
# via aiobotocore
50-
botocore==1.34.69
54+
botocore==1.34.131
5155
# via
5256
# aiobotocore
5357
# boto3

‎services/dynamic-sidecar/requirements/_test.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
aioboto3==12.4.0
1+
aioboto3==13.1.0
22
# via -r requirements/_test.in
3-
aiobotocore==2.12.3
3+
aiobotocore==2.13.1
44
# via aioboto3
5+
aiofiles==23.2.1
6+
# via
7+
# -c requirements/_base.txt
8+
# aioboto3
59
aiohttp==3.9.3
610
# via
711
# -c requirements/../../../requirements/constraints.txt
@@ -25,9 +29,9 @@ attrs==23.2.0
2529
# via
2630
# -c requirements/_base.txt
2731
# aiohttp
28-
boto3==1.34.69
32+
boto3==1.34.131
2933
# via aiobotocore
30-
botocore==1.34.69
34+
botocore==1.34.131
3135
# via
3236
# aiobotocore
3337
# boto3

0 commit comments

Comments
 (0)