Skip to content

Commit 71f148a

Browse files
author
Andrei Neagu
committed
Merge remote-tracking branch 'upstream/master' into pr-osparc-merge-mmaster-topy2-branch2
2 parents c9a48cc + 1032d56 commit 71f148a

File tree

240 files changed

+2832
-1340
lines changed

Some content is hidden

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

240 files changed

+2832
-1340
lines changed

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

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

@@ -392,7 +392,7 @@ jobs:
392392
run: ./ci/github/unit-testing/webserver.bash install
393393
- name: test
394394
run: ./ci/github/unit-testing/webserver.bash test_with_db 02
395-
- uses: codecov/codecov-action@v4.5.0
395+
- uses: codecov/codecov-action@v4.6.0
396396
with:
397397
flags: unittests #optional
398398

@@ -431,7 +431,7 @@ jobs:
431431
run: ./ci/github/unit-testing/webserver.bash install
432432
- name: test
433433
run: ./ci/github/unit-testing/webserver.bash test_with_db 03
434-
- uses: codecov/codecov-action@v4.5.0
434+
- uses: codecov/codecov-action@v4.6.0
435435
with:
436436
flags: unittests #optional
437437

@@ -473,7 +473,7 @@ jobs:
473473
- name: test
474474
if: always()
475475
run: ./ci/github/unit-testing/storage.bash test
476-
- uses: codecov/codecov-action@v4.5.0
476+
- uses: codecov/codecov-action@v4.6.0
477477
with:
478478
flags: unittests #optional
479479

@@ -517,7 +517,7 @@ jobs:
517517
- name: test
518518
if: always()
519519
run: ./ci/github/unit-testing/agent.bash test
520-
- uses: codecov/codecov-action@v4.5.0
520+
- uses: codecov/codecov-action@v4.6.0
521521
with:
522522
flags: unittests #optional
523523

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

@@ -640,7 +640,7 @@ jobs:
640640
- name: test
641641
if: always()
642642
run: ./ci/github/unit-testing/autoscaling.bash test
643-
- uses: codecov/codecov-action@v4.5.0
643+
- uses: codecov/codecov-action@v4.6.0
644644
with:
645645
flags: unittests #optional
646646

@@ -688,7 +688,7 @@ jobs:
688688
with:
689689
name: ${{ github.job }}_docker_logs
690690
path: ./services/catalog/test_failures
691-
- uses: codecov/codecov-action@v4.5.0
691+
- uses: codecov/codecov-action@v4.6.0
692692
with:
693693
flags: unittests #optional
694694

@@ -741,7 +741,7 @@ jobs:
741741
source .venv/bin/activate && \
742742
pushd services/clusters-keeper && \
743743
make test-ci-unit
744-
- uses: codecov/codecov-action@v4.5.0
744+
- uses: codecov/codecov-action@v4.6.0
745745
with:
746746
flags: unittests #optional
747747

@@ -789,7 +789,7 @@ jobs:
789789
with:
790790
name: ${{ github.job }}_docker_logs
791791
path: ./services/datcore-adapter/test_failures
792-
- uses: codecov/codecov-action@v4.5.0
792+
- uses: codecov/codecov-action@v4.6.0
793793
with:
794794
flags: unittests #optional
795795

@@ -824,7 +824,7 @@ jobs:
824824
run: ./ci/github/unit-testing/director.bash install
825825
- name: test
826826
run: ./ci/github/unit-testing/director.bash test
827-
- uses: codecov/codecov-action@v4.5.0
827+
- uses: codecov/codecov-action@v4.6.0
828828
with:
829829
flags: unittests #optional
830830

@@ -872,7 +872,7 @@ jobs:
872872
with:
873873
name: ${{ github.job }}_docker_logs
874874
path: ./services/director-v2/test_failures
875-
- uses: codecov/codecov-action@v4.5.0
875+
- uses: codecov/codecov-action@v4.6.0
876876
with:
877877
flags: unittests #optional
878878

@@ -914,7 +914,7 @@ jobs:
914914
- name: test
915915
if: always()
916916
run: ./ci/github/unit-testing/aws-library.bash test
917-
- uses: codecov/codecov-action@v4.5.0
917+
- uses: codecov/codecov-action@v4.6.0
918918
with:
919919
flags: unittests #optional
920920

@@ -956,7 +956,7 @@ jobs:
956956
- name: test
957957
if: always()
958958
run: ./ci/github/unit-testing/dask-task-models-library.bash test
959-
- uses: codecov/codecov-action@v4.5.0
959+
- uses: codecov/codecov-action@v4.6.0
960960
with:
961961
flags: unittests #optional
962962

@@ -998,7 +998,7 @@ jobs:
998998
- name: test
999999
if: always()
10001000
run: ./ci/github/unit-testing/dask-sidecar.bash test
1001-
- uses: codecov/codecov-action@v4.5.0
1001+
- uses: codecov/codecov-action@v4.6.0
10021002
with:
10031003
flags: unittests #optional
10041004

@@ -1050,7 +1050,7 @@ jobs:
10501050
source .venv/bin/activate && \
10511051
pushd services/osparc-gateway-server && \
10521052
make test-ci-unit
1053-
- uses: codecov/codecov-action@v4.5.0
1053+
- uses: codecov/codecov-action@v4.6.0
10541054
with:
10551055
flags: unittests #optional
10561056

@@ -1092,7 +1092,7 @@ jobs:
10921092
- name: test
10931093
if: always()
10941094
run: ./ci/github/unit-testing/payments.bash test
1095-
- uses: codecov/codecov-action@v4.5.0
1095+
- uses: codecov/codecov-action@v4.6.0
10961096
with:
10971097
flags: unittests #optional
10981098

@@ -1134,7 +1134,7 @@ jobs:
11341134
- name: test
11351135
if: always()
11361136
run: ./ci/github/unit-testing/dynamic-scheduler.bash test
1137-
- uses: codecov/codecov-action@v4.5.0
1137+
- uses: codecov/codecov-action@v4.6.0
11381138
with:
11391139
flags: unittests #optional
11401140

@@ -1186,7 +1186,7 @@ jobs:
11861186
source .venv/bin/activate && \
11871187
pushd services/resource-usage-tracker && \
11881188
make test-ci-unit
1189-
- uses: codecov/codecov-action@v4.5.0
1189+
- uses: codecov/codecov-action@v4.6.0
11901190
with:
11911191
flags: unittests #optional
11921192

@@ -1228,7 +1228,7 @@ jobs:
12281228
- name: test
12291229
if: always()
12301230
run: ./ci/github/unit-testing/dynamic-sidecar.bash test
1231-
- uses: codecov/codecov-action@v4.5.0
1231+
- uses: codecov/codecov-action@v4.6.0
12321232
with:
12331233
flags: unittests #optional
12341234

@@ -1281,7 +1281,7 @@ jobs:
12811281
source .venv/bin/activate && \
12821282
pushd services/efs-guardian && \
12831283
make test-ci-unit
1284-
- uses: codecov/codecov-action@v4.5.0
1284+
- uses: codecov/codecov-action@v4.6.0
12851285
with:
12861286
flags: unittests #optional
12871287

@@ -1395,7 +1395,7 @@ jobs:
13951395
- name: test
13961396
if: always()
13971397
run: ./ci/github/unit-testing/postgres-database.bash test
1398-
- uses: codecov/codecov-action@v4.5.0
1398+
- uses: codecov/codecov-action@v4.6.0
13991399
with:
14001400
flags: unittests #optional
14011401

@@ -1437,7 +1437,7 @@ jobs:
14371437
- name: test
14381438
if: always()
14391439
run: ./ci/github/unit-testing/invitations.bash test
1440-
- uses: codecov/codecov-action@v4.5.0
1440+
- uses: codecov/codecov-action@v4.6.0
14411441
with:
14421442
flags: unittests #optional
14431443

@@ -1479,7 +1479,7 @@ jobs:
14791479
- name: test
14801480
if: always()
14811481
run: ./ci/github/unit-testing/service-integration.bash test
1482-
- uses: codecov/codecov-action@v4.5.0
1482+
- uses: codecov/codecov-action@v4.6.0
14831483
with:
14841484
flags: unittests #optional
14851485

@@ -1521,7 +1521,7 @@ jobs:
15211521
- name: test
15221522
if: always()
15231523
run: ./ci/github/unit-testing/service-library.bash test_all
1524-
- uses: codecov/codecov-action@v4.5.0
1524+
- uses: codecov/codecov-action@v4.6.0
15251525
with:
15261526
flags: unittests #optional
15271527

@@ -1563,7 +1563,7 @@ jobs:
15631563
- name: test
15641564
if: always()
15651565
run: ./ci/github/unit-testing/settings-library.bash test
1566-
- uses: codecov/codecov-action@v4.5.0
1566+
- uses: codecov/codecov-action@v4.6.0
15671567
with:
15681568
flags: unittests #optional
15691569

@@ -1604,7 +1604,7 @@ jobs:
16041604
run: ./ci/github/unit-testing/models-library.bash typecheck
16051605
- name: test
16061606
run: ./ci/github/unit-testing/models-library.bash test
1607-
- uses: codecov/codecov-action@v4.5.0
1607+
- uses: codecov/codecov-action@v4.6.0
16081608
with:
16091609
flags: unittests #optional
16101610

@@ -1691,7 +1691,7 @@ jobs:
16911691
- name: test
16921692
if: always()
16931693
run: ./ci/github/unit-testing/notifications-library.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

@@ -1735,7 +1735,7 @@ jobs:
17351735
- name: test
17361736
if: always()
17371737
run: ./ci/github/unit-testing/simcore-sdk.bash test
1738-
- uses: codecov/codecov-action@v4.5.0
1738+
- uses: codecov/codecov-action@v4.6.0
17391739
with:
17401740
flags: unittests #optional
17411741

@@ -1845,7 +1845,7 @@ jobs:
18451845
- name: cleanup
18461846
if: always()
18471847
run: ./ci/github/integration-testing/webserver.bash clean_up
1848-
- uses: codecov/codecov-action@v4.5.0
1848+
- uses: codecov/codecov-action@v4.6.0
18491849
with:
18501850
flags: integrationtests #optional
18511851

@@ -1907,7 +1907,7 @@ jobs:
19071907
- name: cleanup
19081908
if: always()
19091909
run: ./ci/github/integration-testing/webserver.bash clean_up
1910-
- uses: codecov/codecov-action@v4.5.0
1910+
- uses: codecov/codecov-action@v4.6.0
19111911
with:
19121912
flags: integrationtests #optional
19131913

@@ -1969,7 +1969,7 @@ jobs:
19691969
- name: cleanup
19701970
if: always()
19711971
run: ./ci/github/integration-testing/director-v2.bash clean_up
1972-
- uses: codecov/codecov-action@v4.5.0
1972+
- uses: codecov/codecov-action@v4.6.0
19731973
with:
19741974
flags: integrationtests #optional
19751975

@@ -2035,7 +2035,7 @@ jobs:
20352035
- name: cleanup
20362036
if: always()
20372037
run: ./ci/github/integration-testing/director-v2.bash clean_up
2038-
- uses: codecov/codecov-action@v4.5.0
2038+
- uses: codecov/codecov-action@v4.6.0
20392039
with:
20402040
flags: integrationtests #optional
20412041

@@ -2099,7 +2099,7 @@ jobs:
20992099
- name: cleanup
21002100
if: always()
21012101
run: ./ci/github/integration-testing/dynamic-sidecar.bash clean_up
2102-
- uses: codecov/codecov-action@v4.5.0
2102+
- uses: codecov/codecov-action@v4.6.0
21032103
with:
21042104
flags: integrationtests #optional
21052105

@@ -2176,7 +2176,7 @@ jobs:
21762176
run: |
21772177
pushd services/osparc-gateway-server && \
21782178
make down
2179-
- uses: codecov/codecov-action@v4.5.0
2179+
- uses: codecov/codecov-action@v4.6.0
21802180
with:
21812181
flags: integrationtests #optional
21822182

@@ -2238,7 +2238,7 @@ jobs:
22382238
- name: cleanup
22392239
if: always()
22402240
run: ./ci/github/integration-testing/simcore-sdk.bash clean_up
2241-
- uses: codecov/codecov-action@v4.5.0
2241+
- uses: codecov/codecov-action@v4.6.0
22422242
with:
22432243
flags: integrationtests
22442244

‎Makefile‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ help: ## help on rule's targets
128128

129129

130130
test_python_version: ## Check Python version, throw error if compilation would fail with the installed version
131-
python ./scripts/test_python_version.py
131+
# Checking python version
132+
@.venv/bin/python ./scripts/test_python_version.py
132133

133134

134135
## DOCKER BUILD -------------------------------
@@ -332,6 +333,7 @@ printf "$$rows" "Rabbit Dashboard" "http://$(get_my_ip).nip.io:15672" admin admi
332333
printf "$$rows" "Redis" "http://$(get_my_ip).nip.io:18081";\
333334
printf "$$rows" "Storage S3 Minio" "http://$(get_my_ip).nip.io:9001" 12345678 12345678;\
334335
printf "$$rows" "Traefik Dashboard" "http://$(get_my_ip).nip.io:8080/dashboard/";\
336+
printf "$$rows" "Vendor Manual (Fake)" "http://manual.$(get_my_ip).nip.io:9081";\
335337

336338
printf "\n%s\n" "⚠️ if a DNS is not used (as displayed above), the interactive services started via dynamic-sidecar";\
337339
echo "⚠️ will not be shown. The frontend accesses them via the uuid.services.YOUR_IP.nip.io:9081";
@@ -481,7 +483,7 @@ push-version: tag-version
481483

482484
.venv: .check-uv-installed
483485
@uv venv $@
484-
## upgrading tools to latest version in $(shell python3 --version)
486+
@echo "# upgrading tools to latest version in" && $@/bin/python --version
485487
@uv pip --quiet install --upgrade \
486488
pip~=24.0 \
487489
wheel \
@@ -683,9 +685,9 @@ info-registry: ## info on local registry (if any)
683685

684686
## INFO -------------------------------
685687

686-
.PHONY: info info-images info-swarm info-tools
688+
.PHONY: info info-images info-swarm
687689
info: ## displays setup information
688-
# setup info:
690+
@echo setup info --------------------------------
689691
@echo ' Detected OS : $(IS_LINUX)$(IS_OSX)$(IS_WSL)$(IS_WSL2)$(IS_WIN)'
690692
@echo ' SWARM_STACK_NAME : ${SWARM_STACK_NAME}'
691693
@echo ' DOCKER_REGISTRY : $(DOCKER_REGISTRY)'
@@ -695,19 +697,23 @@ info: ## displays setup information
695697
@echo ' - ULR : ${VCS_URL}'
696698
@echo ' - REF : ${VCS_REF}'
697699
@echo ' - (STATUS)REF_CLIENT : (${VCS_STATUS_CLIENT}) ${VCS_REF_CLIENT}'
698-
@echo ' DIRECTOR_API_VERSION : ${DIRECTOR_API_VERSION}'
699-
@echo ' STORAGE_API_VERSION : ${STORAGE_API_VERSION}'
700-
@echo ' DATCORE_ADAPTER_API_VERSION : ${DATCORE_ADAPTER_API_VERSION}'
701-
@echo ' WEBSERVER_API_VERSION : ${WEBSERVER_API_VERSION}'
702-
# dev tools version
703-
@echo ' make : $(shell make --version 2>&1 | head -n 1)'
704-
@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 -------------------------
705706
@echo ' awk : $(shell awk -W version 2>&1 | head -n 1)'
706-
@echo ' python : $(shell python3 --version)'
707-
@echo ' node : $(shell node --version 2> /dev/null || echo ERROR nodejs missing)'
708707
@echo ' docker : $(shell docker --version)'
709708
@echo ' docker buildx : $(shell docker buildx version)'
710709
@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+
711717

712718

713719
define show-meta

0 commit comments

Comments
 (0)