Skip to content

Commit aa0605d

Browse files
authored
Merge branch 'master' into feature/trash-bin
2 parents 23eb445 + e3b3673 commit aa0605d

File tree

91 files changed

+2247
-1202
lines changed

Some content is hidden

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

91 files changed

+2247
-1202
lines changed

.codecov.yml

Lines changed: 120 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,138 @@
11
codecov:
2-
require_ci_to_pass: true
2+
require_ci_to_pass: false
33
branch: master
4+
github_checks:
5+
annotations: false
46

5-
coverage:
6-
precision: 1
7-
round: down
8-
range: "70...100"
7+
flag_management:
8+
default_rules:
9+
carryforward: true
10+
statuses:
11+
- type: project
12+
target: auto
13+
threshold: 1%
14+
- type: patch
15+
target: auto
16+
threshold: 1%
17+
18+
19+
component_management:
20+
default_rules:
21+
statuses:
22+
- type: project
23+
target: auto
24+
branches:
25+
- "!master"
26+
individual_components:
27+
- component_id: api
28+
paths:
29+
- api/**
30+
- component_id: pkg_aws_library
31+
paths:
32+
- packages/aws-library/**
33+
- component_id: pkg_dask_task_models_library
34+
paths:
35+
- packages/dask-task-models-library/**
36+
- component_id: pkg_models_library
37+
paths:
38+
- packages/models-library/**
39+
- component_id: pkg_notifications_library
40+
paths:
41+
- packages/notifications-library/**
42+
- component_id: pkg_postgres_database
43+
paths:
44+
- packages/postgres-database/**
45+
- component_id: pkg_service_integration
46+
paths:
47+
- packages/service-integration/**
48+
- component_id: pkg_service_library
49+
paths:
50+
- packages/service-library/**
51+
- component_id: pkg_settings_library
52+
paths:
53+
- packages/settings-library/**
54+
- component_id: pkg_simcore_sdk
55+
paths:
56+
- packages/simcore-sdk/**
57+
- component_id: agent
58+
paths:
59+
- services/agent/**
60+
- component_id: api_server
61+
paths:
62+
- services/api-server/**
63+
- component_id: autoscaling
64+
paths:
65+
- services/autoscaling/**
66+
- component_id: catalog
67+
paths:
68+
- services/catalog/**
69+
- component_id: clusters_keeper
70+
paths:
71+
- services/clusters-keeper/**
72+
- component_id: dask_sidecar
73+
paths:
74+
- services/dask-sidecar/**
75+
- component_id: datcore_adapter
76+
paths:
77+
- services/datcore-adapter/**
78+
- component_id: director
79+
paths:
80+
- services/director/**
81+
- component_id: director_v2
82+
paths:
83+
- services/director-v2/**
84+
- component_id: dynamic_scheduler
85+
paths:
86+
- services/dynamic-scheduler/**
87+
- component_id: dynamic_sidecar
88+
paths:
89+
- services/dynamic-sidecar/**
90+
- component_id: efs_guardian
91+
paths:
92+
- services/efs-guardian/**
93+
- component_id: invitations
94+
paths:
95+
- services/invitations/**
96+
- component_id: osparc_gateway_server
97+
paths:
98+
- services/osparc-gateway-server/**
99+
- component_id: payments
100+
paths:
101+
- services/payments/**
102+
- component_id: resource_usage_tracker
103+
paths:
104+
- services/resource-usage-tracker/**
105+
- component_id: storage
106+
paths:
107+
- services/storage/**
108+
- component_id: webclient
109+
paths:
110+
- services/static-webserver/client/**
111+
- component_id: webserver
112+
paths:
113+
- services/web/server/**
9114

115+
coverage:
10116
status:
11117
project:
12118
default:
13119
informational: true
14120
threshold: 1%
15-
paths:
16-
- api
17-
- packages
18-
- services
19-
carryforward: true
20-
api:
21-
informational: true
22-
threshold: 1%
23-
paths:
24-
- api
25-
carryforward: true
26-
packages:
27-
informational: true
28-
threshold: 1%
29-
paths:
30-
- packages
31-
carryforward: true
32-
services:
33-
informational: true
34-
threshold: 1%
35-
paths:
36-
- services
37-
carryforward: true
38121

39122
patch:
40123
default:
41124
informational: true
42125
threshold: 1%
43-
paths:
44-
- api
45-
- packages
46-
- services
47-
48-
parsers:
49-
gcov:
50-
branch_detection:
51-
conditional: yes
52-
loop: yes
53-
method: no
54-
macro: no
55126

56127
comment:
57-
layout: "reach,diff,flags,tree"
128+
layout: "header,diff,flags,components,footer"
58129
behavior: default
59130
require_changes: false
131+
show_carryforward_flags: true
132+
133+
134+
ignore:
135+
- "test_*.py"
136+
- "**/generated_models/*.py"
137+
- "**/generated_code/*.py"
138+
- "**/node_modules/**"

.env-devel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ LOGIN_ACCOUNT_DELETION_RETENTION_DAYS=31
309309
LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=0
310310
LOGIN_REGISTRATION_INVITATION_REQUIRED=0
311311
PROJECTS_INACTIVITY_INTERVAL=20
312+
PROJECTS_TRASH_RETENTION_DAYS=7
312313
PROJECTS_MAX_COPY_SIZE_BYTES=30Gib
313314
PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES=5
314315
REST_SWAGGER_API_DOC_ENABLED=1

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"block-scoped-var": "warn",
2424
"brace-style": [
2525
"warn",
26-
"stroustrup"
26+
"1tbs"
2727
],
2828
"indent": [
2929
"warn",

0 commit comments

Comments
 (0)