Skip to content

Commit 47450ec

Browse files
pcrespovpcrespov
authored
Merge branch 'master' into dependabot/github_actions/astral-sh/setup-uv-4
2 parents 544d186 + 2710879 commit 47450ec

File tree

86 files changed

+1773
-1475
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1773
-1475
lines changed

‎.github/workflows/ci-testing-deploy.yml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ jobs:
354354
- name: test
355355
if: ${{ !cancelled() }}
356356
run: ./ci/github/unit-testing/webserver.bash test_with_db 01
357-
- uses: codecov/[email protected].2
357+
- uses: codecov/[email protected].7
358358
env:
359359
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
360360
with:
@@ -399,7 +399,7 @@ jobs:
399399
run: ./ci/github/unit-testing/webserver.bash install
400400
- name: test
401401
run: ./ci/github/unit-testing/webserver.bash test_with_db 02
402-
- uses: codecov/[email protected].2
402+
- uses: codecov/[email protected].7
403403
env:
404404
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
405405
with:
@@ -444,7 +444,7 @@ jobs:
444444
run: ./ci/github/unit-testing/webserver.bash install
445445
- name: test
446446
run: ./ci/github/unit-testing/webserver.bash test_with_db 03
447-
- uses: codecov/[email protected].2
447+
- uses: codecov/[email protected].7
448448
env:
449449
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
450450
with:
@@ -489,7 +489,7 @@ jobs:
489489
run: ./ci/github/unit-testing/webserver.bash install
490490
- name: test
491491
run: ./ci/github/unit-testing/webserver.bash test_with_db 04
492-
- uses: codecov/[email protected].2
492+
- uses: codecov/[email protected].7
493493
env:
494494
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
495495
with:
@@ -537,7 +537,7 @@ jobs:
537537
- name: test
538538
if: ${{ !cancelled() }}
539539
run: ./ci/github/unit-testing/storage.bash test
540-
- uses: codecov/[email protected].2
540+
- uses: codecov/[email protected].7
541541
env:
542542
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
543543
with:
@@ -587,7 +587,7 @@ jobs:
587587
- name: test
588588
if: ${{ !cancelled() }}
589589
run: ./ci/github/unit-testing/agent.bash test
590-
- uses: codecov/[email protected].2
590+
- uses: codecov/[email protected].7
591591
env:
592592
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
593593
with:
@@ -632,7 +632,7 @@ jobs:
632632
run: ./ci/github/unit-testing/api.bash install
633633
- name: test
634634
run: ./ci/github/unit-testing/api.bash test
635-
- uses: codecov/[email protected].2
635+
- uses: codecov/[email protected].7
636636
env:
637637
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
638638
with:
@@ -683,7 +683,7 @@ jobs:
683683
- name: OAS backwards compatibility check
684684
if: ${{ !cancelled() }}
685685
run: ./ci/github/unit-testing/api-server.bash openapi-diff
686-
- uses: codecov/[email protected].2
686+
- uses: codecov/[email protected].7
687687
env:
688688
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
689689
with:
@@ -731,7 +731,7 @@ jobs:
731731
- name: test
732732
if: ${{ !cancelled() }}
733733
run: ./ci/github/unit-testing/autoscaling.bash test
734-
- uses: codecov/[email protected].2
734+
- uses: codecov/[email protected].7
735735
env:
736736
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
737737
with:
@@ -785,7 +785,7 @@ jobs:
785785
with:
786786
name: ${{ github.job }}_docker_logs
787787
path: ./services/catalog/test_failures
788-
- uses: codecov/[email protected].2
788+
- uses: codecov/[email protected].7
789789
env:
790790
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
791791
with:
@@ -844,7 +844,7 @@ jobs:
844844
source .venv/bin/activate && \
845845
pushd services/clusters-keeper && \
846846
make test-ci-unit
847-
- uses: codecov/[email protected].2
847+
- uses: codecov/[email protected].7
848848
env:
849849
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
850850
with:
@@ -898,7 +898,7 @@ jobs:
898898
with:
899899
name: ${{ github.job }}_docker_logs
900900
path: ./services/datcore-adapter/test_failures
901-
- uses: codecov/[email protected].2
901+
- uses: codecov/[email protected].7
902902
env:
903903
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
904904
with:
@@ -952,7 +952,7 @@ jobs:
952952
with:
953953
name: ${{ github.job }}_docker_logs
954954
path: ./services/director/test_failures
955-
- uses: codecov/[email protected].2
955+
- uses: codecov/[email protected].7
956956
env:
957957
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
958958
with:
@@ -1006,7 +1006,7 @@ jobs:
10061006
with:
10071007
name: ${{ github.job }}_docker_logs
10081008
path: ./services/director-v2/test_failures
1009-
- uses: codecov/[email protected].2
1009+
- uses: codecov/[email protected].7
10101010
env:
10111011
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
10121012
with:
@@ -1054,7 +1054,7 @@ jobs:
10541054
- name: test
10551055
if: ${{ !cancelled() }}
10561056
run: ./ci/github/unit-testing/aws-library.bash test
1057-
- uses: codecov/[email protected].2
1057+
- uses: codecov/[email protected].7
10581058
env:
10591059
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
10601060
with:
@@ -1102,7 +1102,7 @@ jobs:
11021102
- name: test
11031103
if: ${{ !cancelled() }}
11041104
run: ./ci/github/unit-testing/dask-task-models-library.bash test
1105-
- uses: codecov/[email protected].2
1105+
- uses: codecov/[email protected].7
11061106
env:
11071107
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
11081108
with:
@@ -1150,7 +1150,7 @@ jobs:
11501150
- name: test
11511151
if: ${{ !cancelled() }}
11521152
run: ./ci/github/unit-testing/dask-sidecar.bash test
1153-
- uses: codecov/[email protected].2
1153+
- uses: codecov/[email protected].7
11541154
env:
11551155
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
11561156
with:
@@ -1208,7 +1208,7 @@ jobs:
12081208
source .venv/bin/activate && \
12091209
pushd services/osparc-gateway-server && \
12101210
make test-ci-unit
1211-
- uses: codecov/[email protected].2
1211+
- uses: codecov/[email protected].7
12121212
env:
12131213
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
12141214
with:
@@ -1256,7 +1256,7 @@ jobs:
12561256
- name: test
12571257
if: ${{ !cancelled() }}
12581258
run: ./ci/github/unit-testing/payments.bash test
1259-
- uses: codecov/[email protected].2
1259+
- uses: codecov/[email protected].7
12601260
env:
12611261
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
12621262
with:
@@ -1304,7 +1304,7 @@ jobs:
13041304
- name: test
13051305
if: ${{ !cancelled() }}
13061306
run: ./ci/github/unit-testing/dynamic-scheduler.bash test
1307-
- uses: codecov/[email protected].2
1307+
- uses: codecov/[email protected].7
13081308
env:
13091309
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
13101310
with:
@@ -1362,7 +1362,7 @@ jobs:
13621362
source .venv/bin/activate && \
13631363
pushd services/resource-usage-tracker && \
13641364
make test-ci-unit
1365-
- uses: codecov/[email protected].2
1365+
- uses: codecov/[email protected].7
13661366
env:
13671367
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
13681368
with:
@@ -1410,7 +1410,7 @@ jobs:
14101410
- name: test
14111411
if: ${{ !cancelled() }}
14121412
run: ./ci/github/unit-testing/dynamic-sidecar.bash test
1413-
- uses: codecov/[email protected].2
1413+
- uses: codecov/[email protected].7
14141414
env:
14151415
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
14161416
with:
@@ -1469,7 +1469,7 @@ jobs:
14691469
source .venv/bin/activate && \
14701470
pushd services/efs-guardian && \
14711471
make test-ci-unit
1472-
- uses: codecov/[email protected].2
1472+
- uses: codecov/[email protected].7
14731473
env:
14741474
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
14751475
with:
@@ -1552,7 +1552,7 @@ jobs:
15521552
- name: test
15531553
if: ${{ !cancelled() }}
15541554
run: ./ci/github/unit-testing/postgres-database.bash test
1555-
- uses: codecov/[email protected].2
1555+
- uses: codecov/[email protected].7
15561556
env:
15571557
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
15581558
with:
@@ -1600,7 +1600,7 @@ jobs:
16001600
- name: test
16011601
if: ${{ !cancelled() }}
16021602
run: ./ci/github/unit-testing/invitations.bash test
1603-
- uses: codecov/[email protected].2
1603+
- uses: codecov/[email protected].7
16041604
env:
16051605
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
16061606
with:
@@ -1648,7 +1648,7 @@ jobs:
16481648
- name: test
16491649
if: ${{ !cancelled() }}
16501650
run: ./ci/github/unit-testing/service-integration.bash test
1651-
- uses: codecov/[email protected].2
1651+
- uses: codecov/[email protected].7
16521652
env:
16531653
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
16541654
with:
@@ -1696,7 +1696,7 @@ jobs:
16961696
- name: test
16971697
if: ${{ !cancelled() }}
16981698
run: ./ci/github/unit-testing/service-library.bash test_all
1699-
- uses: codecov/[email protected].2
1699+
- uses: codecov/[email protected].7
17001700
env:
17011701
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
17021702
with:
@@ -1744,7 +1744,7 @@ jobs:
17441744
- name: test
17451745
if: ${{ !cancelled() }}
17461746
run: ./ci/github/unit-testing/settings-library.bash test
1747-
- uses: codecov/[email protected].2
1747+
- uses: codecov/[email protected].7
17481748
env:
17491749
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
17501750
with:
@@ -1791,7 +1791,7 @@ jobs:
17911791
run: ./ci/github/unit-testing/models-library.bash typecheck
17921792
- name: test
17931793
run: ./ci/github/unit-testing/models-library.bash test
1794-
- uses: codecov/[email protected].2
1794+
- uses: codecov/[email protected].7
17951795
env:
17961796
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
17971797
with:
@@ -1839,7 +1839,7 @@ jobs:
18391839
run: ./ci/github/unit-testing/common-library.bash typecheck
18401840
- name: test
18411841
run: ./ci/github/unit-testing/common-library.bash test
1842-
- uses: codecov/codecov-action@v4.5.0
1842+
- uses: codecov/codecov-action@v5.0.7
18431843
with:
18441844
flags: unittests #optional
18451845

@@ -1882,7 +1882,7 @@ jobs:
18821882
- name: test
18831883
if: ${{ !cancelled() }}
18841884
run: ./ci/github/unit-testing/notifications-library.bash test
1885-
- uses: codecov/[email protected].2
1885+
- uses: codecov/[email protected].7
18861886
env:
18871887
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
18881888
with:
@@ -1932,7 +1932,7 @@ jobs:
19321932
- name: test
19331933
if: ${{ !cancelled() }}
19341934
run: ./ci/github/unit-testing/simcore-sdk.bash test
1935-
- uses: codecov/[email protected].2
1935+
- uses: codecov/[email protected].7
19361936
env:
19371937
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
19381938
with:
@@ -2048,7 +2048,7 @@ jobs:
20482048
- name: cleanup
20492049
if: ${{ !cancelled() }}
20502050
run: ./ci/github/integration-testing/webserver.bash clean_up
2051-
- uses: codecov/[email protected].2
2051+
- uses: codecov/[email protected].7
20522052
env:
20532053
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
20542054
with:
@@ -2111,7 +2111,7 @@ jobs:
21112111
- name: cleanup
21122112
if: ${{ !cancelled() }}
21132113
run: ./ci/github/integration-testing/webserver.bash clean_up
2114-
- uses: codecov/[email protected].2
2114+
- uses: codecov/[email protected].7
21152115
env:
21162116
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
21172117
with:
@@ -2174,7 +2174,7 @@ jobs:
21742174
- name: cleanup
21752175
if: ${{ !cancelled() }}
21762176
run: ./ci/github/integration-testing/director-v2.bash clean_up
2177-
- uses: codecov/[email protected].2
2177+
- uses: codecov/[email protected].7
21782178
env:
21792179
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
21802180
with:
@@ -2246,7 +2246,7 @@ jobs:
22462246
- name: cleanup
22472247
if: ${{ !cancelled() }}
22482248
run: ./ci/github/integration-testing/director-v2.bash clean_up
2249-
- uses: codecov/[email protected].2
2249+
- uses: codecov/[email protected].7
22502250
env:
22512251
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
22522252
with:
@@ -2311,7 +2311,7 @@ jobs:
23112311
- name: cleanup
23122312
if: ${{ !cancelled() }}
23132313
run: ./ci/github/integration-testing/dynamic-sidecar.bash clean_up
2314-
- uses: codecov/[email protected].2
2314+
- uses: codecov/[email protected].7
23152315
env:
23162316
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
23172317
with:
@@ -2389,7 +2389,7 @@ jobs:
23892389
run: |
23902390
pushd services/osparc-gateway-server && \
23912391
make down
2392-
- uses: codecov/[email protected].2
2392+
- uses: codecov/[email protected].7
23932393
env:
23942394
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
23952395
with:
@@ -2452,7 +2452,7 @@ jobs:
24522452
- name: cleanup
24532453
if: ${{ !cancelled() }}
24542454
run: ./ci/github/integration-testing/simcore-sdk.bash clean_up
2455-
- uses: codecov/[email protected].2
2455+
- uses: codecov/[email protected].7
24562456
env:
24572457
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
24582458
with:

‎packages/models-library/src/models_library/projects_nodes_ui.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ class Position(BaseModel):
1616

1717

1818
class Marker(BaseModel):
19-
color: Annotated[Color, PlainSerializer(str), Field(...)]
19+
color: Annotated[Color, PlainSerializer(Color.as_hex), Field(...)]
2020

2121
model_config = ConfigDict(extra="forbid")

‎packages/models-library/src/models_library/projects_ui.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Slideshow(_SlideshowRequired, total=False):
3131

3232
class Annotation(BaseModel):
3333
type: Literal["note", "rect", "text"] = Field(...)
34-
color: Annotated[Color, PlainSerializer(str), Field(...)]
34+
color: Annotated[Color, PlainSerializer(Color.as_hex), Field(...)]
3535
attributes: dict = Field(..., description="svg attributes")
3636
model_config = ConfigDict(
3737
extra="forbid",

‎packages/models-library/src/models_library/rest_ordering.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ class OrderBy(BaseModel):
2727

2828

2929
class _BaseOrderQueryParams(RequestParameters):
30-
order_by: OrderBy | None = None
30+
order_by: OrderBy
3131

3232

33-
def create_ordering_query_model_classes(
33+
def create_ordering_query_model_class(
3434
*,
3535
ordering_fields: set[str],
3636
default: OrderBy,

‎packages/models-library/tests/test_projects_nodes_ui.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
import pytest
12
from models_library.projects_nodes_ui import Marker
23
from pydantic_extra_types.color import Color
34

45

5-
def test_marker_serialization():
6-
m = Marker(color=Color("#b7e28d"))
7-
8-
assert m.model_dump_json() == '{"color":"#b7e28d"}'
6+
@pytest.mark.parametrize(
7+
"color_str,expected_color_str", [("#b7e28d", "#b7e28d"), ("Cyan", "#0ff")]
8+
)
9+
def test_marker_color_serialized_to_hex(color_str, expected_color_str):
10+
m = Marker(color=Color(color_str))
11+
assert m.model_dump_json() == f'{{"color":"{expected_color_str}"}}'

0 commit comments

Comments
 (0)