Skip to content

Commit 5ceffe8

Browse files
author
Andrei Neagu
committed
Merge remote-tracking branch 'upstream/master' into pr-osparc-reword-disk-usage-notification
2 parents e1b581c + aff7a8b commit 5ceffe8

File tree

72 files changed

+589
-492
lines changed

Some content is hidden

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

72 files changed

+589
-492
lines changed

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

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ jobs:
350350
- name: test
351351
if: always()
352352
run: ./ci/github/unit-testing/webserver.bash test_with_db 01
353-
- uses: codecov/codecov-action@v4.5.0
353+
- uses: codecov/codecov-action@v4.6.0
354354
with:
355355
flags: unittests #optional
356356

@@ -389,7 +389,7 @@ jobs:
389389
run: ./ci/github/unit-testing/webserver.bash install
390390
- name: test
391391
run: ./ci/github/unit-testing/webserver.bash test_with_db 02
392-
- uses: codecov/codecov-action@v4.5.0
392+
- uses: codecov/codecov-action@v4.6.0
393393
with:
394394
flags: unittests #optional
395395

@@ -428,7 +428,7 @@ jobs:
428428
run: ./ci/github/unit-testing/webserver.bash install
429429
- name: test
430430
run: ./ci/github/unit-testing/webserver.bash test_with_db 03
431-
- uses: codecov/codecov-action@v4.5.0
431+
- uses: codecov/codecov-action@v4.6.0
432432
with:
433433
flags: unittests #optional
434434

@@ -470,7 +470,7 @@ jobs:
470470
- name: test
471471
if: always()
472472
run: ./ci/github/unit-testing/storage.bash test
473-
- uses: codecov/codecov-action@v4.5.0
473+
- uses: codecov/codecov-action@v4.6.0
474474
with:
475475
flags: unittests #optional
476476

@@ -514,7 +514,7 @@ jobs:
514514
- name: test
515515
if: always()
516516
run: ./ci/github/unit-testing/agent.bash test
517-
- uses: codecov/codecov-action@v4.5.0
517+
- uses: codecov/codecov-action@v4.6.0
518518
with:
519519
flags: unittests #optional
520520

@@ -595,7 +595,7 @@ jobs:
595595
- name: OAS backwards compatibility check
596596
if: always()
597597
run: ./ci/github/unit-testing/api-server.bash openapi-diff
598-
- uses: codecov/codecov-action@v4.5.0
598+
- uses: codecov/codecov-action@v4.6.0
599599
with:
600600
flags: unittests #optional
601601

@@ -637,7 +637,7 @@ jobs:
637637
- name: test
638638
if: always()
639639
run: ./ci/github/unit-testing/autoscaling.bash test
640-
- uses: codecov/codecov-action@v4.5.0
640+
- uses: codecov/codecov-action@v4.6.0
641641
with:
642642
flags: unittests #optional
643643

@@ -685,7 +685,7 @@ jobs:
685685
with:
686686
name: ${{ github.job }}_docker_logs
687687
path: ./services/catalog/test_failures
688-
- uses: codecov/codecov-action@v4.5.0
688+
- uses: codecov/codecov-action@v4.6.0
689689
with:
690690
flags: unittests #optional
691691

@@ -738,7 +738,7 @@ jobs:
738738
source .venv/bin/activate && \
739739
pushd services/clusters-keeper && \
740740
make test-ci-unit
741-
- uses: codecov/codecov-action@v4.5.0
741+
- uses: codecov/codecov-action@v4.6.0
742742
with:
743743
flags: unittests #optional
744744

@@ -786,7 +786,7 @@ jobs:
786786
with:
787787
name: ${{ github.job }}_docker_logs
788788
path: ./services/datcore-adapter/test_failures
789-
- uses: codecov/codecov-action@v4.5.0
789+
- uses: codecov/codecov-action@v4.6.0
790790
with:
791791
flags: unittests #optional
792792

@@ -821,7 +821,7 @@ jobs:
821821
run: ./ci/github/unit-testing/director.bash install
822822
- name: test
823823
run: ./ci/github/unit-testing/director.bash test
824-
- uses: codecov/codecov-action@v4.5.0
824+
- uses: codecov/codecov-action@v4.6.0
825825
with:
826826
flags: unittests #optional
827827

@@ -869,7 +869,7 @@ jobs:
869869
with:
870870
name: ${{ github.job }}_docker_logs
871871
path: ./services/director-v2/test_failures
872-
- uses: codecov/codecov-action@v4.5.0
872+
- uses: codecov/codecov-action@v4.6.0
873873
with:
874874
flags: unittests #optional
875875

@@ -911,7 +911,7 @@ jobs:
911911
- name: test
912912
if: always()
913913
run: ./ci/github/unit-testing/aws-library.bash test
914-
- uses: codecov/codecov-action@v4.5.0
914+
- uses: codecov/codecov-action@v4.6.0
915915
with:
916916
flags: unittests #optional
917917

@@ -953,7 +953,7 @@ jobs:
953953
- name: test
954954
if: always()
955955
run: ./ci/github/unit-testing/dask-task-models-library.bash test
956-
- uses: codecov/codecov-action@v4.5.0
956+
- uses: codecov/codecov-action@v4.6.0
957957
with:
958958
flags: unittests #optional
959959

@@ -995,7 +995,7 @@ jobs:
995995
- name: test
996996
if: always()
997997
run: ./ci/github/unit-testing/dask-sidecar.bash test
998-
- uses: codecov/codecov-action@v4.5.0
998+
- uses: codecov/codecov-action@v4.6.0
999999
with:
10001000
flags: unittests #optional
10011001

@@ -1047,7 +1047,7 @@ jobs:
10471047
source .venv/bin/activate && \
10481048
pushd services/osparc-gateway-server && \
10491049
make test-ci-unit
1050-
- uses: codecov/codecov-action@v4.5.0
1050+
- uses: codecov/codecov-action@v4.6.0
10511051
with:
10521052
flags: unittests #optional
10531053

@@ -1089,7 +1089,7 @@ jobs:
10891089
- name: test
10901090
if: always()
10911091
run: ./ci/github/unit-testing/payments.bash test
1092-
- uses: codecov/codecov-action@v4.5.0
1092+
- uses: codecov/codecov-action@v4.6.0
10931093
with:
10941094
flags: unittests #optional
10951095

@@ -1131,7 +1131,7 @@ jobs:
11311131
- name: test
11321132
if: always()
11331133
run: ./ci/github/unit-testing/dynamic-scheduler.bash test
1134-
- uses: codecov/codecov-action@v4.5.0
1134+
- uses: codecov/codecov-action@v4.6.0
11351135
with:
11361136
flags: unittests #optional
11371137

@@ -1183,7 +1183,7 @@ jobs:
11831183
source .venv/bin/activate && \
11841184
pushd services/resource-usage-tracker && \
11851185
make test-ci-unit
1186-
- uses: codecov/codecov-action@v4.5.0
1186+
- uses: codecov/codecov-action@v4.6.0
11871187
with:
11881188
flags: unittests #optional
11891189

@@ -1225,7 +1225,7 @@ jobs:
12251225
- name: test
12261226
if: always()
12271227
run: ./ci/github/unit-testing/dynamic-sidecar.bash test
1228-
- uses: codecov/codecov-action@v4.5.0
1228+
- uses: codecov/codecov-action@v4.6.0
12291229
with:
12301230
flags: unittests #optional
12311231

@@ -1278,7 +1278,7 @@ jobs:
12781278
source .venv/bin/activate && \
12791279
pushd services/efs-guardian && \
12801280
make test-ci-unit
1281-
- uses: codecov/codecov-action@v4.5.0
1281+
- uses: codecov/codecov-action@v4.6.0
12821282
with:
12831283
flags: unittests #optional
12841284

@@ -1392,7 +1392,7 @@ jobs:
13921392
- name: test
13931393
if: always()
13941394
run: ./ci/github/unit-testing/postgres-database.bash test
1395-
- uses: codecov/codecov-action@v4.5.0
1395+
- uses: codecov/codecov-action@v4.6.0
13961396
with:
13971397
flags: unittests #optional
13981398

@@ -1434,7 +1434,7 @@ jobs:
14341434
- name: test
14351435
if: always()
14361436
run: ./ci/github/unit-testing/invitations.bash test
1437-
- uses: codecov/codecov-action@v4.5.0
1437+
- uses: codecov/codecov-action@v4.6.0
14381438
with:
14391439
flags: unittests #optional
14401440

@@ -1476,7 +1476,7 @@ jobs:
14761476
- name: test
14771477
if: always()
14781478
run: ./ci/github/unit-testing/service-integration.bash test
1479-
- uses: codecov/codecov-action@v4.5.0
1479+
- uses: codecov/codecov-action@v4.6.0
14801480
with:
14811481
flags: unittests #optional
14821482

@@ -1518,7 +1518,7 @@ jobs:
15181518
- name: test
15191519
if: always()
15201520
run: ./ci/github/unit-testing/service-library.bash test_all
1521-
- uses: codecov/codecov-action@v4.5.0
1521+
- uses: codecov/codecov-action@v4.6.0
15221522
with:
15231523
flags: unittests #optional
15241524

@@ -1560,7 +1560,7 @@ jobs:
15601560
- name: test
15611561
if: always()
15621562
run: ./ci/github/unit-testing/settings-library.bash test
1563-
- uses: codecov/codecov-action@v4.5.0
1563+
- uses: codecov/codecov-action@v4.6.0
15641564
with:
15651565
flags: unittests #optional
15661566

@@ -1601,7 +1601,7 @@ jobs:
16011601
run: ./ci/github/unit-testing/models-library.bash typecheck
16021602
- name: test
16031603
run: ./ci/github/unit-testing/models-library.bash test
1604-
- uses: codecov/codecov-action@v4.5.0
1604+
- uses: codecov/codecov-action@v4.6.0
16051605
with:
16061606
flags: unittests #optional
16071607

@@ -1647,7 +1647,7 @@ jobs:
16471647
- name: test
16481648
if: always()
16491649
run: ./ci/github/unit-testing/notifications-library.bash test
1650-
- uses: codecov/codecov-action@v4.5.0
1650+
- uses: codecov/codecov-action@v4.6.0
16511651
with:
16521652
flags: unittests #optional
16531653

@@ -1691,7 +1691,7 @@ jobs:
16911691
- name: test
16921692
if: always()
16931693
run: ./ci/github/unit-testing/simcore-sdk.bash test
1694-
- uses: codecov/codecov-action@v4.5.0
1694+
- uses: codecov/codecov-action@v4.6.0
16951695
with:
16961696
flags: unittests #optional
16971697

@@ -1800,7 +1800,7 @@ jobs:
18001800
- name: cleanup
18011801
if: always()
18021802
run: ./ci/github/integration-testing/webserver.bash clean_up
1803-
- uses: codecov/codecov-action@v4.5.0
1803+
- uses: codecov/codecov-action@v4.6.0
18041804
with:
18051805
flags: integrationtests #optional
18061806

@@ -1862,7 +1862,7 @@ jobs:
18621862
- name: cleanup
18631863
if: always()
18641864
run: ./ci/github/integration-testing/webserver.bash clean_up
1865-
- uses: codecov/codecov-action@v4.5.0
1865+
- uses: codecov/codecov-action@v4.6.0
18661866
with:
18671867
flags: integrationtests #optional
18681868

@@ -1924,7 +1924,7 @@ jobs:
19241924
- name: cleanup
19251925
if: always()
19261926
run: ./ci/github/integration-testing/director-v2.bash clean_up
1927-
- uses: codecov/codecov-action@v4.5.0
1927+
- uses: codecov/codecov-action@v4.6.0
19281928
with:
19291929
flags: integrationtests #optional
19301930

@@ -1990,7 +1990,7 @@ jobs:
19901990
- name: cleanup
19911991
if: always()
19921992
run: ./ci/github/integration-testing/director-v2.bash clean_up
1993-
- uses: codecov/codecov-action@v4.5.0
1993+
- uses: codecov/codecov-action@v4.6.0
19941994
with:
19951995
flags: integrationtests #optional
19961996

@@ -2054,7 +2054,7 @@ jobs:
20542054
- name: cleanup
20552055
if: always()
20562056
run: ./ci/github/integration-testing/dynamic-sidecar.bash clean_up
2057-
- uses: codecov/codecov-action@v4.5.0
2057+
- uses: codecov/codecov-action@v4.6.0
20582058
with:
20592059
flags: integrationtests #optional
20602060

@@ -2131,7 +2131,7 @@ jobs:
21312131
run: |
21322132
pushd services/osparc-gateway-server && \
21332133
make down
2134-
- uses: codecov/codecov-action@v4.5.0
2134+
- uses: codecov/codecov-action@v4.6.0
21352135
with:
21362136
flags: integrationtests #optional
21372137

@@ -2193,7 +2193,7 @@ jobs:
21932193
- name: cleanup
21942194
if: always()
21952195
run: ./ci/github/integration-testing/simcore-sdk.bash clean_up
2196-
- uses: codecov/codecov-action@v4.5.0
2196+
- uses: codecov/codecov-action@v4.6.0
21972197
with:
21982198
flags: integrationtests
21992199

‎Makefile‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -685,9 +685,9 @@ info-registry: ## info on local registry (if any)
685685

686686
## INFO -------------------------------
687687

688-
.PHONY: info info-images info-swarm info-tools
688+
.PHONY: info info-images info-swarm
689689
info: ## displays setup information
690-
# setup info:
690+
@echo setup info --------------------------------
691691
@echo ' Detected OS : $(IS_LINUX)$(IS_OSX)$(IS_WSL)$(IS_WSL2)$(IS_WIN)'
692692
@echo ' SWARM_STACK_NAME : ${SWARM_STACK_NAME}'
693693
@echo ' DOCKER_REGISTRY : $(DOCKER_REGISTRY)'
@@ -697,19 +697,23 @@ info: ## displays setup information
697697
@echo ' - ULR : ${VCS_URL}'
698698
@echo ' - REF : ${VCS_REF}'
699699
@echo ' - (STATUS)REF_CLIENT : (${VCS_STATUS_CLIENT}) ${VCS_REF_CLIENT}'
700-
@echo ' DIRECTOR_API_VERSION : ${DIRECTOR_API_VERSION}'
701-
@echo ' STORAGE_API_VERSION : ${STORAGE_API_VERSION}'
702-
@echo ' DATCORE_ADAPTER_API_VERSION : ${DATCORE_ADAPTER_API_VERSION}'
703-
@echo ' WEBSERVER_API_VERSION : ${WEBSERVER_API_VERSION}'
704-
# dev tools version
705-
@echo ' make : $(shell make --version 2>&1 | head -n 1)'
706-
@echo ' jq : $(shell jq --version)'
700+
@make --silent info-tools
701+
702+
703+
.PHONY: show-tools
704+
info-tools: ## displays tools versions
705+
@echo dev-tools versions -------------------------
707706
@echo ' awk : $(shell awk -W version 2>&1 | head -n 1)'
708-
@echo ' python : $(shell python3 --version)'
709-
@echo ' node : $(shell node --version 2> /dev/null || echo ERROR nodejs missing)'
710707
@echo ' docker : $(shell docker --version)'
711708
@echo ' docker buildx : $(shell docker buildx version)'
712709
@echo ' docker compose: $(shell docker compose version)'
710+
@echo ' jq : $(shell jq --version)'
711+
@echo ' make : $(shell make --version 2>&1 | head -n 1)'
712+
@echo ' node : $(shell node --version 2> /dev/null || echo ERROR nodejs missing)'
713+
@echo ' python : $(shell python3 --version)'
714+
@echo ' uv : $(shell uv --version 2> /dev/null || echo ERROR uv missing)'
715+
@echo ' ubuntu : $(shell lsb_release --description --short 2> /dev/null | tail || echo ERROR Not an Ubuntu OS )'
716+
713717

714718

715719
define show-meta

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ pyyaml==6.0.2
210210
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
211211
# -c requirements/../../../requirements/constraints.txt
212212
# -r requirements/../../../packages/service-library/requirements/_base.in
213-
redis==5.0.8
213+
redis==5.0.4
214214
# via
215215
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
216216
# -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt

‎packages/models-library/src/models_library/api_schemas_dynamic_sidecar/ports.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ class OutputStatus(StrAutoEnum):
1111
UPLOAD_STARTED = auto()
1212
UPLOAD_WAS_ABORTED = auto()
1313
UPLOAD_FINISHED_SUCCESSFULLY = auto()
14-
UPLOAD_FINISHED_WITH_ERRROR = auto()
14+
UPLOAD_FINISHED_WITH_ERROR = auto()
1515

1616

1717
class InputStatus(StrAutoEnum):
1818
DOWNLOAD_STARTED = auto()
1919
DOWNLOAD_WAS_ABORTED = auto()
2020
DOWNLOAD_FINISHED_SUCCESSFULLY = auto()
21-
DOWNLOAD_FINISHED_WITH_ERRROR = auto()
21+
DOWNLOAD_FINISHED_WITH_ERROR = auto()
2222

2323

2424
class _PortStatusCommon(BaseModel):

0 commit comments

Comments
 (0)