Skip to content

Commit 9b9468d

Browse files
sandereggsanderegg
committed
unblock moto
1 parent 981f27a commit 9b9468d

File tree

20 files changed

+214
-79
lines changed

20 files changed

+214
-79
lines changed

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ jmespath==1.0.1
117117
# botocore
118118
joserfc==1.0.4
119119
# via moto
120-
jsondiff==2.2.1
121-
# via moto
122120
jsonpatch==1.33
123121
# via cfn-lint
124122
jsonpath-ng==1.7.0
@@ -144,10 +142,8 @@ markupsafe==3.0.2
144142
# via
145143
# jinja2
146144
# werkzeug
147-
moto==5.0.20
148-
# via
149-
# -c requirements/../../../requirements/constraints.txt
150-
# -r requirements/_test.in
145+
moto==5.1.1
146+
# via -r requirements/_test.in
151147
mpmath==1.3.0
152148
# via sympy
153149
networkx==3.4.2
@@ -175,7 +171,7 @@ pprintpp==0.4.0
175171
# via pytest-icdiff
176172
py-cpuinfo==9.0.0
177173
# via pytest-benchmark
178-
py-partiql-parser==0.5.6
174+
py-partiql-parser==0.6.1
179175
# via moto
180176
pycparser==2.22
181177
# via cffi
@@ -234,7 +230,6 @@ pyyaml==6.0.2
234230
# -c requirements/_base.txt
235231
# -r requirements/_test.in
236232
# cfn-lint
237-
# jsondiff
238233
# jsonschema-path
239234
# moto
240235
# responses

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,6 @@ jmespath==1.0.1
137137
# botocore
138138
joserfc==1.0.4
139139
# via moto
140-
jsondiff==2.2.1
141-
# via moto
142140
jsonpatch==1.33
143141
# via cfn-lint
144142
jsonpath-ng==1.7.0
@@ -171,10 +169,8 @@ markupsafe==3.0.2
171169
# jinja2
172170
# mako
173171
# werkzeug
174-
moto==5.0.20
175-
# via
176-
# -c requirements/../../../requirements/constraints.txt
177-
# -r requirements/_test.in
172+
moto==5.1.1
173+
# via -r requirements/_test.in
178174
mpmath==1.3.0
179175
# via sympy
180176
multidict==6.1.0
@@ -211,7 +207,7 @@ propcache==0.3.0
211207
# -c requirements/_base.txt
212208
# aiohttp
213209
# yarl
214-
py-partiql-parser==0.5.6
210+
py-partiql-parser==0.6.1
215211
# via moto
216212
pycparser==2.22
217213
# via cffi
@@ -268,7 +264,6 @@ pyyaml==6.0.2
268264
# -c requirements/../../../requirements/constraints.txt
269265
# -c requirements/_base.txt
270266
# cfn-lint
271-
# jsondiff
272267
# jsonschema-path
273268
# moto
274269
# responses

‎requirements/constraints.txt‎

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

75-
# moto==5.0.21 broke `get_ec2_instance_capabilities`
76-
# SEE https://github.com/ITISFoundation/osparc-simcore/issues/7086
77-
moto<5.0.21
78-
7975
# Pin boto3<1.36.0 till the following is addressed https://github.com/boto/botocore/issues/2308
8076
# when removing this pin, also update the aws cli inside ci/github/helpers/install_aws_cli_v2.bash
8177
# SEE https://github.com/ITISFoundation/osparc-simcore/issues/7127

‎services/agent/requirements/_test.txt‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,6 @@ jmespath==1.0.1
138138
# botocore
139139
joserfc==1.0.4
140140
# via moto
141-
jsondiff==2.2.1
142-
# via moto
143141
jsonpatch==1.33
144142
# via cfn-lint
145143
jsonpath-ng==1.7.0
@@ -165,10 +163,8 @@ markupsafe==3.0.2
165163
# via
166164
# jinja2
167165
# werkzeug
168-
moto==5.0.20
169-
# via
170-
# -c requirements/../../../requirements/constraints.txt
171-
# -r requirements/_test.in
166+
moto==5.1.1
167+
# via -r requirements/_test.in
172168
mpmath==1.3.0
173169
# via sympy
174170
multidict==6.1.0
@@ -197,7 +193,7 @@ propcache==0.3.0
197193
# -c requirements/_base.txt
198194
# aiohttp
199195
# yarl
200-
py-partiql-parser==0.5.6
196+
py-partiql-parser==0.6.1
201197
# via moto
202198
pycparser==2.22
203199
# via cffi
@@ -242,7 +238,6 @@ pyyaml==6.0.2
242238
# -c requirements/../../../requirements/constraints.txt
243239
# -c requirements/_base.txt
244240
# cfn-lint
245-
# jsondiff
246241
# jsonschema-path
247242
# moto
248243
# responses

‎services/api-server/requirements/_base.txt‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,34 @@ pydantic-extra-types==2.10.0
619619
# fastapi
620620
pydantic-settings==2.6.1
621621
# via
622+
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
623+
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
624+
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
625+
# -c requirements/../../../packages/postgres-database/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
626+
# -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
627+
# -c requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
628+
# -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
629+
# -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
630+
# -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
631+
# -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
632+
# -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
633+
# -c requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
634+
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
635+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
636+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
637+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
638+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
639+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
640+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
641+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
642+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
643+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
644+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
645+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
646+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
647+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
648+
# -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
649+
# -c requirements/../../../requirements/constraints.txt
622650
# -r requirements/../../../packages/models-library/requirements/_base.in
623651
# -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
624652
# -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in

‎services/api-server/requirements/_test.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ markupsafe==3.0.2
196196
# moto
197197
moto==4.0.1
198198
# via
199-
# -c requirements/../../../requirements/constraints.txt
200199
# -c requirements/./constraints.txt
201200
# -r requirements/_test.in
202201
multidict==6.1.0
@@ -236,7 +235,7 @@ psutil==6.1.0
236235
# via
237236
# -c requirements/_base.txt
238237
# pact-python
239-
pyasn1==0.6.1
238+
pyasn1==0.4.8
240239
# via
241240
# python-jose
242241
# rsa
@@ -368,7 +367,6 @@ typing-extensions==4.12.2
368367
# -c requirements/_base.txt
369368
# alembic
370369
# anyio
371-
# faker
372370
# fastapi
373371
# mypy
374372
# pydantic

‎services/autoscaling/requirements/_base.txt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,30 @@ pydantic-extra-types==2.10.0
556556
# -r requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in
557557
pydantic-settings==2.6.1
558558
# via
559+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
560+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
561+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
562+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
563+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
564+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
565+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
566+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
567+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
568+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
569+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
570+
# -c requirements/../../../packages/aws-library/requirements/../../../requirements/constraints.txt
571+
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
572+
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
573+
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
574+
# -c requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
575+
# -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
576+
# -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
577+
# -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
578+
# -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
579+
# -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
580+
# -c requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
581+
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
582+
# -c requirements/../../../requirements/constraints.txt
559583
# -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in
560584
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
561585
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in

‎services/autoscaling/requirements/_test.txt‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ jmespath==1.0.1
125125
# botocore
126126
joserfc==1.0.4
127127
# via moto
128-
jsondiff==2.2.1
129-
# via moto
130128
jsonpatch==1.33
131129
# via cfn-lint
132130
jsonpath-ng==1.7.0
@@ -155,10 +153,8 @@ markupsafe==3.0.2
155153
# -c requirements/_base.txt
156154
# jinja2
157155
# werkzeug
158-
moto==5.0.20
159-
# via
160-
# -c requirements/../../../requirements/constraints.txt
161-
# -r requirements/_test.in
156+
moto==5.1.1
157+
# via -r requirements/_test.in
162158
mpmath==1.3.0
163159
# via sympy
164160
networkx==3.4.2
@@ -186,7 +182,7 @@ psutil==6.1.0
186182
# via
187183
# -c requirements/_base.txt
188184
# -r requirements/_test.in
189-
py-partiql-parser==0.5.6
185+
py-partiql-parser==0.6.1
190186
# via moto
191187
pycparser==2.22
192188
# via cffi
@@ -237,7 +233,6 @@ pyyaml==6.0.2
237233
# -c requirements/../../../requirements/constraints.txt
238234
# -c requirements/_base.txt
239235
# cfn-lint
240-
# jsondiff
241236
# jsonschema-path
242237
# moto
243238
# responses

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,30 @@ pydantic-extra-types==2.10.0
554554
# -r requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in
555555
pydantic-settings==2.6.1
556556
# via
557+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
558+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
559+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
560+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
561+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
562+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
563+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
564+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
565+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
566+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
567+
# -c requirements/../../../packages/aws-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
568+
# -c requirements/../../../packages/aws-library/requirements/../../../requirements/constraints.txt
569+
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
570+
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
571+
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
572+
# -c requirements/../../../packages/service-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
573+
# -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
574+
# -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
575+
# -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
576+
# -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
577+
# -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
578+
# -c requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
579+
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
580+
# -c requirements/../../../requirements/constraints.txt
557581
# -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in
558582
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
559583
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,6 @@ jmespath==1.0.1
143143
# botocore
144144
joserfc==1.0.4
145145
# via moto
146-
jsondiff==2.2.1
147-
# via moto
148146
jsonpatch==1.33
149147
# via cfn-lint
150148
jsonpath-ng==1.7.0
@@ -173,10 +171,8 @@ markupsafe==3.0.2
173171
# -c requirements/_base.txt
174172
# jinja2
175173
# werkzeug
176-
moto==5.0.20
177-
# via
178-
# -c requirements/../../../requirements/constraints.txt
179-
# -r requirements/_test.in
174+
moto==5.1.1
175+
# via -r requirements/_test.in
180176
mpmath==1.3.0
181177
# via sympy
182178
multidict==6.1.0
@@ -213,7 +209,7 @@ psutil==6.1.0
213209
# via
214210
# -c requirements/_base.txt
215211
# -r requirements/_test.in
216-
py-partiql-parser==0.5.6
212+
py-partiql-parser==0.6.1
217213
# via moto
218214
pycparser==2.22
219215
# via cffi
@@ -258,7 +254,6 @@ pyyaml==6.0.2
258254
# -c requirements/../../../requirements/constraints.txt
259255
# -c requirements/_base.txt
260256
# cfn-lint
261-
# jsondiff
262257
# jsonschema-path
263258
# moto
264259
# responses

0 commit comments

Comments
 (0)