Skip to content

Commit

Permalink
Merge branch 'master' into feature/bind-model-to-card
Browse files Browse the repository at this point in the history
  • Loading branch information
odeimaiz authored Aug 21, 2024
2 parents c5d2ed1 + db96384 commit 73a19fb
Show file tree
Hide file tree
Showing 1,782 changed files with 61,279 additions and 29,552 deletions.
5 changes: 4 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,12 @@ exclude_lines =
# Don't complain if non-runnable code isn't run:
if 0:
if __name__ == .__main__.:

if __name__ == __main__.:
# Don't complain about abstract methods, they aren't run:
@(abc\.)?abstract(((class|static)?method)|property)

# Don't complain about type checking
if TYPE_CHECKING:

ignore_errors = True
show_missing = True
24 changes: 24 additions & 0 deletions .env-devel
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ AGENT_VOLUMES_CLEANUP_S3_SECRET_KEY=12345678
API_SERVER_DEV_FEATURES_ENABLED=0
API_SERVER_LOGLEVEL=WARNING
API_SERVER_PROFILING=1
TRAEFIK_API_SERVER_INFLIGHTREQ_AMOUNT=25

AUTOSCALING_DASK=null
AUTOSCALING_DRAIN_NODES_WITH_LABELS=False
Expand All @@ -29,7 +30,11 @@ AUTOSCALING_EC2_INSTANCES=null
AUTOSCALING_LOGLEVEL=WARNING
AUTOSCALING_NODES_MONITORING=null
AUTOSCALING_POLL_INTERVAL=10
AUTOSCALING_SSM_ACCESS=null

AWS_S3_CLI_S3='{"S3_ACCESS_KEY":"12345678", "S3_BUCKET_NAME":"simcore", "S3_ENDPOINT": "http://172.17.0.1:9001", "S3_SECRET_KEY": "12345678", "S3_REGION": "us-east-1"}'

CATALOG_BACKGROUND_TASK_REST_TIME=60
CATALOG_DEV_FEATURES_ENABLED=0
CATALOG_HOST=catalog
CATALOG_LOGLEVEL=WARNING
Expand Down Expand Up @@ -63,6 +68,15 @@ DIRECTOR_PORT=8080
DIRECTOR_REGISTRY_CACHING_TTL=900
DIRECTOR_REGISTRY_CACHING=True

EFS_USER_ID=8006
EFS_USER_NAME=efs
EFS_GROUP_ID=8106
EFS_GROUP_NAME=efs-group
EFS_DNS_NAME=fs-xxx.efs.us-east-1.amazonaws.com
EFS_MOUNTED_PATH=/tmp/efs
EFS_PROJECT_SPECIFIC_DATA_DIRECTORY=project-specific-data
EFS_ONLY_ENABLED_FOR_USERIDS=[]

# DIRECTOR_V2 ----
COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH='{"type":"tls","tls_ca_file":"/home/scu/.dask/dask-crt.pem","tls_client_cert":"/home/scu/.dask/dask-crt.pem","tls_client_key":"/home/scu/.dask/dask-key.pem"}'
COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_FILE_LINK_TYPE=S3
Expand All @@ -71,6 +85,7 @@ COMPUTATIONAL_BACKEND_DEFAULT_FILE_LINK_TYPE=PRESIGNED
COMPUTATIONAL_BACKEND_ON_DEMAND_CLUSTERS_FILE_LINK_TYPE=PRESIGNED
DIRECTOR_V2_DEV_FEATURES_ENABLED=0
DIRECTOR_V2_DYNAMIC_SCHEDULER_CLOSE_SERVICES_VIA_FRONTEND_WHEN_CREDITS_LIMIT_REACHED=1
DIRECTOR_V2_DYNAMIC_SIDECAR_SLEEP_AFTER_CONTAINER_REMOVAL=0
DIRECTOR_V2_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS='{}'
DIRECTOR_V2_HOST=director-v2
DIRECTOR_V2_LOGLEVEL=WARNING
Expand All @@ -79,6 +94,7 @@ DIRECTOR_V2_PORT=8000
DIRECTOR_V2_PROFILING=1
DIRECTOR_V2_PUBLIC_API_BASE_URL=http://127.0.0.1:8006
DIRECTOR_V2_SERVICES_CUSTOM_CONSTRAINTS=[]
DIRECTOR_V2_DOCKER_HUB_REGISTRY=null
DYNAMIC_SIDECAR_ENABLE_VOLUME_LIMITS=False
DYNAMIC_SIDECAR_ENDPOINT_SPECS_MODE_DNSRR_ENABLED=0
DYNAMIC_SIDECAR_IMAGE=${DOCKER_REGISTRY:-itisfoundation}/dynamic-sidecar:${DOCKER_IMAGE_TAG:-latest}
Expand Down Expand Up @@ -141,6 +157,7 @@ RABBIT_USER=admin

REDIS_HOST=redis
REDIS_PORT=6379
REDIS_PASSWORD=adminadmin

REGISTRY_AUTH=True
REGISTRY_PW=adminadminadmin
Expand All @@ -162,6 +179,10 @@ R_CLONE_OPTION_RETRIES=3
R_CLONE_OPTION_TRANSFERS=5
R_CLONE_PROVIDER=MINIO

# simcore-user used in docker images
SC_USER_ID=8004
SC_USER_NAME=scu

S3_ACCESS_KEY=12345678
S3_BUCKET_NAME=simcore
S3_ENDPOINT=http://172.17.0.1:9001
Expand Down Expand Up @@ -199,6 +220,7 @@ WB_GC_DB_LISTENER=0
WB_GC_DIAGNOSTICS=null
WB_GC_EMAIL=null
WB_GC_EXPORTER=null
WB_GC_FOLDERS=0
WB_GC_FRONTEND=null
WB_GC_GARBAGE_COLLECTOR='{"GARBAGE_COLLECTOR_INTERVAL_S": 30}'
WB_GC_GROUPS=0
Expand Down Expand Up @@ -231,6 +253,7 @@ WB_DB_EL_DB_LISTENER=1
WB_DB_EL_DIAGNOSTICS=null
WB_DB_EL_EMAIL=null
WB_DB_EL_EXPORTER=null
WB_DB_EL_FOLDERS=0
WB_DB_EL_FRONTEND=null
WB_DB_EL_GARBAGE_COLLECTOR=null
WB_DB_EL_GROUPS=0
Expand Down Expand Up @@ -296,6 +319,7 @@ WEBSERVER_DIAGNOSTICS={}
WEBSERVER_EMAIL={}
WEBSERVER_EXPORTER={}
WEBSERVER_FRONTEND={}
WEBSERVER_FOLDERS=1
WEBSERVER_GARBAGE_COLLECTOR=null
WEBSERVER_GROUPS=1
WEBSERVER_GUNICORN_CMD_ARGS=--timeout=180
Expand Down
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ Makefile @pcrespov @sanderegg
/packages/settings-library/ @pcrespov @sanderegg
/requirements/ @pcrespov @matusdrobuliak66
/services/agent/ @GitHK
/services/api-server/ @pcrespov @bisgaard-itis
/services/api-server/ @pcrespov
/services/autoscaling/ @sanderegg
/services/catalog/ @pcrespov @sanderegg
/services/clusters-keeper/ @sanderegg
/services/datcore-adapter/ @sanderegg
/services/director*/ @sanderegg @pcrespov @GitHK
/services/docker-compose*.yml @sanderegg @mrnicegyu11 @YuryHrytsuk
/services/dynamic-sidecar/ @GitHK
/services/efs-guardian/ @matusdrobuliak66
/services/invitations/ @pcrespov
/services/migration/ @pcrespov
/services/osparc-gateway-server/ @sanderegg
Expand Down
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/4_pre_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@ body:
placeholder: 7d9dcc313f9ced0bd1e6508363148841683b6d7c
validations:
required: true
- type: input
id: pre_release_date
attributes:
label: Planned date
description: Projected release date for this upcoming version
placeholder: ex. Friday, April 23, 1976
validations:
required: true
- type: checkboxes
attributes:
label: Did the commit CI suceeded?
Expand Down
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/5_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ body:
value: https://github.com/ITISFoundation/osparc-simcore/releases/tag/staging_<sprint_name><version>
validations:
required: true
- type: input
id: release_date
attributes:
label: Planned date
description: Projected release date for this upcoming version
placeholder: ex. Friday, April 23, 1976
validations:
required: true
- type: checkboxes
attributes:
label: Did the commit CI suceeded?
Expand Down
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/6_hotfix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ body:
value: https://github.com/ITISFoundation/osparc-simcore/releases/tag/v<version>
validations:
required: true
- type: input
id: hotfix_date
attributes:
label: Planned date
description: Projected release date for this upcoming version
placeholder: ex. Friday, April 23, 1976
validations:
required: true
- type: textarea
attributes:
label: Motivation
Expand Down
Loading

0 comments on commit 73a19fb

Please sign in to comment.