⬆️Maintenance: upgraded aioboto3 (#6009)

ITISFoundation · Jun 28, 2024 · 2607824 · 2607824
1 parent 1a97db7
commit 2607824
Show file tree

Hide file tree

Showing 20 changed files with 425 additions and 109 deletions.
diff --git a/packages/aws-library/requirements/_base.txt b/packages/aws-library/requirements/_base.txt
@@ -1,8 +1,8 @@
 aio-pika==9.4.1
     # via -r requirements/../../../packages/service-library/requirements/_base.in
-aioboto3==12.4.0
+aioboto3==13.1.0
     # via -r requirements/_base.in
-aiobotocore==2.12.3
+aiobotocore==2.13.1
     # via aioboto3
 aiocache==0.12.2
     # via -r requirements/_base.in
@@ -11,7 +11,9 @@ aiodebug==2.3.0
 aiodocker==0.21.0
     # via -r requirements/../../../packages/service-library/requirements/_base.in
 aiofiles==23.2.1
-    # via -r requirements/../../../packages/service-library/requirements/_base.in
+    # via
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
+    #   aioboto3
 aiohttp==3.9.5
     # via
     #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
@@ -46,9 +48,9 @@ attrs==23.2.0
     #   aiohttp
     #   jsonschema
     #   referencing
-boto3==1.34.69
+boto3==1.34.131
     # via aiobotocore
-botocore==1.34.69
+botocore==1.34.131
     # via
     #   aiobotocore
     #   boto3

diff --git a/packages/aws-library/requirements/_test.txt b/packages/aws-library/requirements/_test.txt
@@ -13,12 +13,12 @@ aws-xray-sdk==2.13.0
     # via moto
 blinker==1.8.1
     # via flask
-boto3==1.34.69
+boto3==1.34.131
     # via
     #   -c requirements/_base.txt
     #   aws-sam-translator
     #   moto
-botocore==1.34.69
+botocore==1.34.131
     # via
     #   -c requirements/_base.txt
     #   aws-xray-sdk

diff --git a/packages/aws-library/tests/test_s3_client.py b/packages/aws-library/tests/test_s3_client.py
@@ -1062,7 +1062,8 @@ async def test_copy_file_invalid_raises(
     file = create_file_of_size(parse_obj_as(ByteSize, "1MiB"))
     uploaded_file = await upload_file(file)
     dst_object_key = faker.file_name()
-    with pytest.raises(S3BucketInvalidError, match=f"{non_existing_s3_bucket}"):
+    # NOTE: since aioboto3 13.1.0 this raises S3KeyNotFoundError instead of S3BucketInvalidError
+    with pytest.raises(S3KeyNotFoundError, match=f"{non_existing_s3_bucket}"):
         await simcore_s3_api.copy_object(
             bucket=non_existing_s3_bucket,
             src_object_key=uploaded_file.s3_key,

diff --git a/packages/simcore-sdk/requirements/_test.txt b/packages/simcore-sdk/requirements/_test.txt
@@ -1,9 +1,11 @@
-aioboto3==9.6.0
-    # via
-    #   -c requirements/./constraints.txt
-    #   -r requirements/_test.in
-aiobotocore==2.3.0
+aioboto3==13.1.0
+    # via -r requirements/_test.in
+aiobotocore==2.13.1
     # via aioboto3
+aiofiles==23.2.1
+    # via
+    #   -c requirements/_base.txt
+    #   aioboto3
 aiohttp==3.9.5
     # via
     #   -c requirements/../../../requirements/constraints.txt
@@ -42,13 +44,12 @@ aws-xray-sdk==2.13.0
     # via moto
 blinker==1.8.1
     # via flask
-boto3==1.21.21
+boto3==1.34.131
     # via
-    #   -c requirements/./constraints.txt
     #   aiobotocore
     #   aws-sam-translator
     #   moto
-botocore==1.24.21
+botocore==1.34.131
     # via
     #   aiobotocore
     #   aws-xray-sdk
@@ -286,7 +287,7 @@ rpds-py==0.18.0
     #   -c requirements/_base.txt
     #   jsonschema
     #   referencing
-s3transfer==0.5.2
+s3transfer==0.10.2
     # via boto3
 sarif-om==1.0.4
     # via cfn-lint

diff --git a/packages/simcore-sdk/requirements/constraints.txt b/packages/simcore-sdk/requirements/constraints.txt
@@ -1,11 +0,0 @@
-# There are incompatible versions in the resolved dependencies:
-#   boto3==1.21.21 (from -c requirements/./constraints.txt (line 3))
-#   boto3<1.24.60,>=1.24.59 (from aiobotocore[boto3]==2.4.0->aioboto3==10.1.0->-r requirements/_test.in (line 13))
-#   boto3>=1.9.201 (from moto[server]==4.0.1->-r requirements/_test.in (line 18))
-aioboto3<=9.6.0
-# There are incompatible versions in the resolved dependencies:
-#   botocore>=1.12.201 (from moto[server]==4.0.1->-r requirements/_test.in (line 18))
-#   botocore>=1.11.3 (from aws-xray-sdk==2.10.0->moto[server]==4.0.1->-r requirements/_test.in (line 18))
-#   botocore<1.28.0,>=1.27.95 (from boto3==1.24.95->moto[server]==4.0.1->-r requirements/_test.in (line 18))
-#   botocore<1.24.22,>=1.24.21 (from aiobotocore[boto3]==2.3.0->aioboto3==9.6.0->-r requirements/_test.in (line 13))
-boto3<=1.21.21

diff --git a/services/agent/requirements/_test.txt b/services/agent/requirements/_test.txt
@@ -1,8 +1,6 @@
-aioboto3==9.6.0
-    # via
-    #   -c requirements/./constraints.txt
-    #   -r requirements/_test.in
-aiobotocore==2.3.0
+aioboto3==12.4.0
+    # via -r requirements/_test.in
+aiobotocore==2.12.3
     # via aioboto3
 aiohttp==3.8.5
     # via
@@ -36,13 +34,12 @@ aws-xray-sdk==2.13.0
     # via moto
 blinker==1.8.1
     # via flask
-boto3==1.21.21
+boto3==1.34.69
     # via
-    #   -c requirements/./constraints.txt
     #   aiobotocore
     #   aws-sam-translator
     #   moto
-botocore==1.24.21
+botocore==1.34.69
     # via
     #   aiobotocore
     #   aws-xray-sdk
@@ -249,7 +246,7 @@ rsa==4.9
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   python-jose
-s3transfer==0.5.2
+s3transfer==0.10.2
     # via boto3
 sarif-om==1.0.4
     # via cfn-lint

diff --git a/services/agent/requirements/constraints.txt b/services/agent/requirements/constraints.txt
@@ -3,21 +3,6 @@
 # CONSTRAINTS DUE TO TEST LIBRARIES
 #
 
-#
-# BELOW COSNTRAINTS are required to install moto[server]
-#
-
-# There are incompatible versions in the resolved dependencies:
-#   boto3==1.21.21 (from -c requirements/./constraints.txt (line 3))
-#   boto3<1.24.60,>=1.24.59 (from aiobotocore[boto3]==2.4.0->aioboto3==10.1.0->-r requirements/_test.in (line 13))
-#   boto3>=1.9.201 (from moto[server]==4.0.1->-r requirements/_test.in (line 18))
-aioboto3<=9.6.0
-# There are incompatible versions in the resolved dependencies:
-#   botocore>=1.12.201 (from moto[server]==4.0.1->-r requirements/_test.in (line 18))
-#   botocore>=1.11.3 (from aws-xray-sdk==2.10.0->moto[server]==4.0.1->-r requirements/_test.in (line 18))
-#   botocore<1.28.0,>=1.27.95 (from boto3==1.24.95->moto[server]==4.0.1->-r requirements/_test.in (line 18))
-#   botocore<1.24.22,>=1.24.21 (from aiobotocore[boto3]==2.3.0->aioboto3==9.6.0->-r requirements/_test.in (line 13))
-boto3<=1.21.21
 # There are incompatible versions in the resolved dependencies:
 #   jsonschema==3.2.0 (from -c requirements/_base.txt (line 159))
 #   jsonschema~=3.2 (from -c requirements/./constraints.txt (line 12))

diff --git a/services/autoscaling/requirements/_base.txt b/services/autoscaling/requirements/_base.txt
@@ -3,9 +3,9 @@ aio-pika==9.4.1
     #   -c requirements/../../../packages/service-library/requirements/./_base.in
     #   -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/service-library/requirements/_base.in
-aioboto3==12.4.0
+aioboto3==13.1.0
     # via -r requirements/../../../packages/aws-library/requirements/_base.in
-aiobotocore==2.12.3
+aiobotocore==2.13.1
     # via aioboto3
 aiocache==0.12.2
     # via
@@ -27,6 +27,7 @@ aiofiles==23.2.1
     #   -c requirements/../../../packages/service-library/requirements/./_base.in
     #   -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/service-library/requirements/_base.in
+    #   aioboto3
 aiohttp==3.9.5
     # via
     #   -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
@@ -74,9 +75,9 @@ attrs==23.2.0
     #   aiohttp
     #   jsonschema
     #   referencing
-boto3==1.34.69
+boto3==1.34.131
     # via aiobotocore
-botocore==1.34.69
+botocore==1.34.131
     # via
     #   aiobotocore
     #   boto3

diff --git a/services/autoscaling/requirements/_test.txt b/services/autoscaling/requirements/_test.txt
@@ -23,12 +23,12 @@ aws-xray-sdk==2.13.1
     # via moto
 blinker==1.8.2
     # via flask
-boto3==1.34.69
+boto3==1.34.131
     # via
     #   -c requirements/_base.txt
     #   aws-sam-translator
     #   moto
-botocore==1.34.69
+botocore==1.34.131
     # via
     #   -c requirements/_base.txt
     #   aws-xray-sdk

diff --git a/services/clusters-keeper/requirements/_base.txt b/services/clusters-keeper/requirements/_base.txt
@@ -3,9 +3,9 @@ aio-pika==9.4.1
     #   -c requirements/../../../packages/service-library/requirements/./_base.in
     #   -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/service-library/requirements/_base.in
-aioboto3==12.4.0
+aioboto3==13.1.0
     # via -r requirements/../../../packages/aws-library/requirements/_base.in
-aiobotocore==2.12.3
+aiobotocore==2.13.1
     # via aioboto3
 aiocache==0.12.2
     # via -r requirements/../../../packages/aws-library/requirements/_base.in
@@ -24,6 +24,7 @@ aiofiles==23.2.1
     #   -c requirements/../../../packages/service-library/requirements/./_base.in
     #   -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/service-library/requirements/_base.in
+    #   aioboto3
 aiohttp==3.9.5
     # via
     #   -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
@@ -71,9 +72,9 @@ attrs==23.2.0
     #   aiohttp
     #   jsonschema
     #   referencing
-boto3==1.34.69
+boto3==1.34.131
     # via aiobotocore
-botocore==1.34.69
+botocore==1.34.131
     # via
     #   aiobotocore
     #   boto3

diff --git a/services/clusters-keeper/requirements/_test.txt b/services/clusters-keeper/requirements/_test.txt
@@ -38,12 +38,12 @@ aws-xray-sdk==2.13.1
     # via moto
 blinker==1.8.2
     # via flask
-boto3==1.34.69
+boto3==1.34.131
     # via
     #   -c requirements/_base.txt
     #   aws-sam-translator
     #   moto
-botocore==1.34.69
+botocore==1.34.131
     # via
     #   -c requirements/_base.txt
     #   aws-xray-sdk

diff --git a/services/director-v2/requirements/_test.txt b/services/director-v2/requirements/_test.txt
@@ -2,10 +2,14 @@ aio-pika==9.4.1
     # via
     #   -c requirements/_base.txt
     #   -r requirements/_test.in
-aioboto3==12.4.0
+aioboto3==13.1.0
     # via -r requirements/_test.in
-aiobotocore==2.12.3
+aiobotocore==2.13.1
     # via aioboto3
+aiofiles==23.2.1
+    # via
+    #   -c requirements/_base.txt
+    #   aioboto3
 aiohttp==3.9.5
     # via
     #   -c requirements/../../../requirements/constraints.txt
@@ -45,9 +49,9 @@ attrs==23.2.0
     #   pytest-docker
 bokeh==3.4.1
     # via dask
-boto3==1.34.69
+boto3==1.34.131
     # via aiobotocore
-botocore==1.34.69
+botocore==1.34.131
     # via
     #   aiobotocore
     #   boto3

diff --git a/services/dynamic-sidecar/requirements/_test.txt b/services/dynamic-sidecar/requirements/_test.txt
@@ -1,7 +1,11 @@
-aioboto3==12.4.0
+aioboto3==13.1.0
     # via -r requirements/_test.in
-aiobotocore==2.12.3
+aiobotocore==2.13.1
     # via aioboto3
+aiofiles==23.2.1
+    # via
+    #   -c requirements/_base.txt
+    #   aioboto3
 aiohttp==3.9.3
     # via
     #   -c requirements/../../../requirements/constraints.txt
@@ -25,9 +29,9 @@ attrs==23.2.0
     # via
     #   -c requirements/_base.txt
     #   aiohttp
-boto3==1.34.69
+boto3==1.34.131
     # via aiobotocore
-botocore==1.34.69
+botocore==1.34.131
     # via
     #   aiobotocore
     #   boto3