Skip to content

Commit 2d68a47

Browse files
authored
⬆️Maintenance: unblock boto3 🚨🚨🚨🚨 (#7572)
1 parent 3880aff commit 2d68a47

File tree

29 files changed

+157
-329
lines changed

29 files changed

+157
-329
lines changed

ci/helpers/requirements/requirements.txt

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
aiohttp==3.9.5
2+
# via
3+
# -c requirements/../../../requirements/constraints.txt
4+
# -r requirements/requirements.in
25
aiosignal==1.3.1
36
# via aiohttp
47
annotated-types==0.7.0
@@ -8,11 +11,15 @@ anyio==4.3.0
811
attrs==23.2.0
912
# via aiohttp
1013
certifi==2024.12.14
11-
# via requests
14+
# via
15+
# -c requirements/../../../requirements/constraints.txt
16+
# requests
1217
charset-normalizer==3.4.1
1318
# via requests
1419
docker==7.1.0
20+
# via -r requirements/requirements.in
1521
fastapi==0.115.0
22+
# via -r requirements/requirements.in
1623
frozenlist==1.4.1
1724
# via
1825
# aiohttp
@@ -27,22 +34,27 @@ multidict==6.0.5
2734
# aiohttp
2835
# yarl
2936
pydantic==2.10.5
30-
# via fastapi
37+
# via
38+
# -c requirements/../../../requirements/constraints.txt
39+
# fastapi
3140
pydantic-core==2.27.2
3241
# via pydantic
3342
requests==2.32.3
3443
# via docker
3544
sniffio==1.3.1
3645
# via anyio
3746
starlette==0.38.6
38-
# via fastapi
47+
# via
48+
# -c requirements/../../../requirements/constraints.txt
49+
# fastapi
3950
typing-extensions==4.12.2
4051
# via
4152
# fastapi
4253
# pydantic
4354
# pydantic-core
4455
urllib3==2.3.0
4556
# via
57+
# -c requirements/../../../requirements/constraints.txt
4658
# docker
4759
# requests
4860
yarl==1.9.4

packages/aws-library/requirements/_base.txt

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
aio-pika==9.5.5
22
# via -r requirements/../../../packages/service-library/requirements/_base.in
3-
aioboto3==13.3.0
3+
aioboto3==14.1.0
44
# via -r requirements/_base.in
5-
aiobotocore==2.16.0
5+
aiobotocore==2.21.1
66
# via aioboto3
77
aiocache==0.12.3
88
# via
@@ -57,22 +57,9 @@ attrs==25.1.0
5757
# aiohttp
5858
# jsonschema
5959
# referencing
60-
boto3==1.35.81
61-
# via
62-
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
63-
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
64-
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
65-
# -c requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
66-
# -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
67-
# -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
68-
# -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
69-
# -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
70-
# -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
71-
# -c requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
72-
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
73-
# -c requirements/../../../requirements/constraints.txt
74-
# aiobotocore
75-
botocore==1.35.81
60+
boto3==1.37.1
61+
# via aiobotocore
62+
botocore==1.37.1
7663
# via
7764
# aiobotocore
7865
# boto3
@@ -134,6 +121,7 @@ importlib-metadata==8.5.0
134121
# via opentelemetry-api
135122
jmespath==1.0.1
136123
# via
124+
# aiobotocore
137125
# boto3
138126
# botocore
139127
jsonschema==4.23.0
@@ -148,6 +136,7 @@ mdurl==0.1.2
148136
# via markdown-it-py
149137
multidict==6.1.0
150138
# via
139+
# aiobotocore
151140
# aiohttp
152141
# yarl
153142
opentelemetry-api==1.30.0
@@ -311,6 +300,7 @@ pyinstrument==5.0.1
311300
# via -r requirements/../../../packages/service-library/requirements/_base.in
312301
python-dateutil==2.9.0.post0
313302
# via
303+
# aiobotocore
314304
# arrow
315305
# botocore
316306
python-dotenv==1.0.1
@@ -372,7 +362,7 @@ rpds-py==0.23.1
372362
# via
373363
# jsonschema
374364
# referencing
375-
s3transfer==0.10.4
365+
s3transfer==0.11.3
376366
# via boto3
377367
sh==2.2.2
378368
# via -r requirements/_base.in

packages/aws-library/requirements/_test.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ aws-xray-sdk==2.14.0
2020
# via moto
2121
blinker==1.9.0
2222
# via flask
23-
boto3==1.35.81
23+
boto3==1.37.1
2424
# via
25-
# -c requirements/../../../requirements/constraints.txt
2625
# -c requirements/_base.txt
2726
# aws-sam-translator
2827
# moto
29-
botocore==1.35.81
28+
botocore==1.37.1
3029
# via
3130
# -c requirements/_base.txt
3231
# aws-xray-sdk
@@ -142,7 +141,7 @@ markupsafe==3.0.2
142141
# via
143142
# jinja2
144143
# werkzeug
145-
moto==5.1.1
144+
moto==5.1.4
146145
# via -r requirements/_test.in
147146
mpmath==1.3.0
148147
# via sympy
@@ -258,7 +257,7 @@ rpds-py==0.23.1
258257
# -c requirements/_base.txt
259258
# jsonschema
260259
# referencing
261-
s3transfer==0.10.4
260+
s3transfer==0.11.3
262261
# via
263262
# -c requirements/_base.txt
264263
# boto3

packages/service-library/requirements/_test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ attrs==25.1.0
2929
# jsonschema
3030
# pytest-docker
3131
# referencing
32-
botocore==1.37.4
32+
botocore==1.38.1
3333
# via -r requirements/_test.in
3434
certifi==2025.1.31
3535
# via

packages/simcore-sdk/requirements/_test.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
aioboto3==13.3.0
1+
aioboto3==14.1.0
22
# via -r requirements/_test.in
3-
aiobotocore==2.16.0
3+
aiobotocore==2.21.1
44
# via aioboto3
55
aiofiles==24.1.0
66
# via
@@ -46,13 +46,12 @@ aws-xray-sdk==2.14.0
4646
# via moto
4747
blinker==1.9.0
4848
# via flask
49-
boto3==1.35.81
49+
boto3==1.37.1
5050
# via
51-
# -c requirements/../../../requirements/constraints.txt
5251
# aiobotocore
5352
# aws-sam-translator
5453
# moto
55-
botocore==1.35.81
54+
botocore==1.37.1
5655
# via
5756
# aiobotocore
5857
# aws-xray-sdk
@@ -133,6 +132,7 @@ jinja2==3.1.5
133132
# moto
134133
jmespath==1.0.1
135134
# via
135+
# aiobotocore
136136
# boto3
137137
# botocore
138138
joserfc==1.0.4
@@ -169,13 +169,14 @@ markupsafe==3.0.2
169169
# jinja2
170170
# mako
171171
# werkzeug
172-
moto==5.1.1
172+
moto==5.1.4
173173
# via -r requirements/_test.in
174174
mpmath==1.3.0
175175
# via sympy
176176
multidict==6.1.0
177177
# via
178178
# -c requirements/_base.txt
179+
# aiobotocore
179180
# aiohttp
180181
# yarl
181182
mypy==1.15.0
@@ -253,6 +254,7 @@ pytest-xdist==3.6.1
253254
python-dateutil==2.9.0.post0
254255
# via
255256
# -c requirements/_base.txt
257+
# aiobotocore
256258
# botocore
257259
# moto
258260
python-dotenv==1.0.1
@@ -293,7 +295,7 @@ rpds-py==0.23.1
293295
# -c requirements/_base.txt
294296
# jsonschema
295297
# referencing
296-
s3transfer==0.10.4
298+
s3transfer==0.11.3
297299
# via boto3
298300
setuptools==75.8.2
299301
# via moto

requirements/constraints.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,5 @@ pytest-lazy-fixture>=999999999
7272
# avoid downgrades of openapi-spec-validator related libraries
7373
referencing<=0.35.1
7474

75-
# Pin boto3<1.36.0 till the following is addressed https://github.com/boto/botocore/issues/2308
76-
# when removing this pin, also update the aws cli inside ci/github/helpers/install_aws_cli_v2.bash
77-
# SEE https://github.com/ITISFoundation/osparc-simcore/issues/7127
78-
boto3<1.36.0
79-
8075
# See issue https://github.com/ITISFoundation/osparc-simcore/issues/7300
8176
pydantic-settings<2.7.1

services/agent/requirements/_test.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
aioboto3==13.3.0
1+
aioboto3==14.1.0
22
# via -r requirements/_test.in
3-
aiobotocore==2.16.0
3+
aiobotocore==2.21.1
44
# via aioboto3
55
aiofiles==24.1.0
66
# via
@@ -45,13 +45,12 @@ aws-xray-sdk==2.14.0
4545
# via moto
4646
blinker==1.9.0
4747
# via flask
48-
boto3==1.35.81
48+
boto3==1.37.1
4949
# via
50-
# -c requirements/../../../requirements/constraints.txt
5150
# aiobotocore
5251
# aws-sam-translator
5352
# moto
54-
botocore==1.35.81
53+
botocore==1.37.1
5554
# via
5655
# aiobotocore
5756
# aws-xray-sdk
@@ -134,6 +133,7 @@ jinja2==3.1.6
134133
# moto
135134
jmespath==1.0.1
136135
# via
136+
# aiobotocore
137137
# boto3
138138
# botocore
139139
joserfc==1.0.4
@@ -163,13 +163,14 @@ markupsafe==3.0.2
163163
# via
164164
# jinja2
165165
# werkzeug
166-
moto==5.1.1
166+
moto==5.1.4
167167
# via -r requirements/_test.in
168168
mpmath==1.3.0
169169
# via sympy
170170
multidict==6.1.0
171171
# via
172172
# -c requirements/_base.txt
173+
# aiobotocore
173174
# aiohttp
174175
# yarl
175176
networkx==3.4.2
@@ -227,6 +228,7 @@ pytest-runner==6.0.1
227228
python-dateutil==2.9.0.post0
228229
# via
229230
# -c requirements/_base.txt
231+
# aiobotocore
230232
# botocore
231233
# moto
232234
python-dotenv==1.0.1
@@ -266,7 +268,7 @@ rpds-py==0.23.1
266268
# -c requirements/_base.txt
267269
# jsonschema
268270
# referencing
269-
s3transfer==0.10.4
271+
s3transfer==0.11.3
270272
# via boto3
271273
setuptools==75.8.2
272274
# via moto

services/api-server/requirements/_base.txt

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ aiohttp==3.11.10
5656
# -r requirements/../../../packages/simcore-sdk/requirements/_base.in
5757
# aiodocker
5858
aiopg==1.4.0
59-
# via
60-
# -r requirements/../../../packages/simcore-sdk/requirements/_base.in
61-
# -r requirements/_base.in
59+
# via -r requirements/_base.in
6260
aiormq==6.8.1
6361
# via aio-pika
6462
aiosignal==1.3.1
@@ -354,10 +352,8 @@ opentelemetry-api==1.28.2
354352
# opentelemetry-exporter-otlp-proto-grpc
355353
# opentelemetry-exporter-otlp-proto-http
356354
# opentelemetry-instrumentation
357-
# opentelemetry-instrumentation-aiopg
358355
# opentelemetry-instrumentation-asgi
359356
# opentelemetry-instrumentation-asyncpg
360-
# opentelemetry-instrumentation-dbapi
361357
# opentelemetry-instrumentation-fastapi
362358
# opentelemetry-instrumentation-httpx
363359
# opentelemetry-instrumentation-logging
@@ -379,25 +375,19 @@ opentelemetry-exporter-otlp-proto-http==1.28.2
379375
# via opentelemetry-exporter-otlp
380376
opentelemetry-instrumentation==0.49b2
381377
# via
382-
# opentelemetry-instrumentation-aiopg
383378
# opentelemetry-instrumentation-asgi
384379
# opentelemetry-instrumentation-asyncpg
385-
# opentelemetry-instrumentation-dbapi
386380
# opentelemetry-instrumentation-fastapi
387381
# opentelemetry-instrumentation-httpx
388382
# opentelemetry-instrumentation-logging
389383
# opentelemetry-instrumentation-redis
390384
# opentelemetry-instrumentation-requests
391-
opentelemetry-instrumentation-aiopg==0.49b2
392-
# via -r requirements/../../../packages/simcore-sdk/requirements/_base.in
393385
opentelemetry-instrumentation-asgi==0.49b2
394386
# via opentelemetry-instrumentation-fastapi
395387
opentelemetry-instrumentation-asyncpg==0.49b2
396388
# via
397389
# -r requirements/../../../packages/postgres-database/requirements/_base.in
398390
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
399-
opentelemetry-instrumentation-dbapi==0.49b2
400-
# via opentelemetry-instrumentation-aiopg
401391
opentelemetry-instrumentation-fastapi==0.49b2
402392
# via -r requirements/../../../packages/service-library/requirements/_fastapi.in
403393
opentelemetry-instrumentation-httpx==0.49b2
@@ -430,7 +420,6 @@ opentelemetry-semantic-conventions==0.49b2
430420
# opentelemetry-instrumentation
431421
# opentelemetry-instrumentation-asgi
432422
# opentelemetry-instrumentation-asyncpg
433-
# opentelemetry-instrumentation-dbapi
434423
# opentelemetry-instrumentation-fastapi
435424
# opentelemetry-instrumentation-httpx
436425
# opentelemetry-instrumentation-redis
@@ -795,6 +784,7 @@ sqlalchemy==1.4.54
795784
# -c requirements/../../../requirements/constraints.txt
796785
# -r requirements/../../../packages/postgres-database/requirements/_base.in
797786
# -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
787+
# -r requirements/../../../packages/simcore-sdk/requirements/_base.in
798788
# aiopg
799789
# alembic
800790
starlette==0.41.3
@@ -952,8 +942,6 @@ wrapt==1.17.0
952942
# via
953943
# deprecated
954944
# opentelemetry-instrumentation
955-
# opentelemetry-instrumentation-aiopg
956-
# opentelemetry-instrumentation-dbapi
957945
# opentelemetry-instrumentation-httpx
958946
# opentelemetry-instrumentation-redis
959947
yarl==1.18.3

0 commit comments

Comments
 (0)