Skip to content

Commit 5ec7ff1

Browse files
authored
FREEZE_XieXie (#1669)
- UI/UX improvements (#1657) - Bump yarl from 1.4.2 to 1.5.1 in /packages/postgres-database (#1665) - Bump ujson from 3.0.0 to 3.1.0 in /packages/service-library (#1664) - Bump pytest-docker from 0.7.2 to 0.8.0 in /packages/service-library (#1647) - Improving storage performance (#1659) - Bump aiozipkin from 0.6.0 to 0.7.0 in /packages/service-library (#1642) - Theming (#1656) - Platform stability: (#1645) - is1594 fix and re-activate e2e testing (#1620) - 2 bugs fixed + Some improvements (#1634) - Fixes default (#1640) - Bump lodash from 4.17.15 to 4.17.19 (#1639) - Is1585/cleanup storage (#1586) - Fixes on publish studies handling (#1632) - Some enhancements and bug fixes (#1608) - Improve e2e (#1631) - filter studies by name before deleting them (#1629) - Maintenance/upgrades test tools (#1628) - Bugfix/concurent opening projects (#1598) - Bugfix/allow reading groups anonymous user (#1615) - Bump docker from 4.2.1 to 4.2.2 in /packages/postgres-database (#1605) - fix testing if node has gpu support (#1604) - [bugfix] Invalidate cache before starting a study (#1602) - Feature/fix e2e 2 (#1600) - fix deploy not needing e2e testing since it is disabled - reduce cardinality of metrics (#1593) - Excudes e2e stage from include until fixed (#1595) - Shared project concurrency (frontend) (#1591) - Homogenize studies and services (#1569) - [feature] UI Fine grained access - project locking and notification - Bugfix/apiserver does not need sslheaders (#1564) - Cleanup catalog service (#1582) - Maintenance/cleanup api server (#1578) - Adds support for GPU scheduling of computational services (#1553) - Maintenance/upgrades and tooling (#1546) - Is1570/study fails 500 (#1572) - Bump faker from 4.1.0 to 4.1.1 in /packages/postgres-database (#1573) - maintenance fix codecov reports (#1568) - Manage groups, Share studies (#1512) - Is/add notebook migration script (#1565) - Is1269/api-server upgrade (#1475) - added simcore_webserver_service in pytest simcore package (#1563) - add traefik endpoint to api-gateway (#1555)
1 parent febb026 commit 5ec7ff1

File tree

579 files changed

+18573
-6845
lines changed

Some content is hidden

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

579 files changed

+18573
-6845
lines changed

.codeclimate.yml

+1
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,4 @@ exclude_patterns:
7878
- "**/migrations/"
7979
- "**/*.js"
8080
- "**/pytest-simcore/"
81+
- "**/sandbox/"

.codecov.yml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
codecov:
2+
require_ci_to_pass: yes
3+
branch: master
4+
5+
coverage:
6+
precision: 1
7+
round: down
8+
range: "70...100"
9+
10+
status:
11+
project:
12+
default:
13+
informational: true
14+
threshold: 1%
15+
paths:
16+
- api
17+
- packages
18+
- services
19+
api:
20+
informational: true
21+
threshold: 1%
22+
paths:
23+
- api
24+
packages:
25+
informational: true
26+
threshold: 1%
27+
paths:
28+
- packages
29+
services:
30+
informational: true
31+
threshold: 1%
32+
paths:
33+
- services
34+
35+
36+
patch:
37+
default:
38+
informational: true
39+
threshold: 1%
40+
paths:
41+
- api
42+
- packages
43+
- services
44+
45+
parsers:
46+
gcov:
47+
branch_detection:
48+
conditional: yes
49+
loop: yes
50+
method: no
51+
macro: no
52+
53+
comment:
54+
layout: "reach,diff,flags,tree"
55+
behavior: default
56+
require_changes: no

.env-devel

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ TRACING_ZIPKIN_ENDPOINT=http://jaeger:9411
4747

4848
TRAEFIK_SIMCORE_ZONE=internal_simcore_stack
4949

50+
WEBSERVER_HOST=webserver
5051
WEBSERVER_LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=0
5152
WEBSERVER_LOGIN_REGISTRATION_INVITATION_REQUIRED=0
5253
# python3 -c "from cryptography.fernet import Fernet; print(Fernet.generate_key())"

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Makefile @pcrespov, @sanderegg
1313
/scripts/demo @odeimaiz, @pcrespov
1414
/scripts/json-schema-to-openapi-schema @sanderegg
1515
/scripts/template-projects @odeimaiz, @pcrespov
16-
/services/api-gateway @pcrespov
16+
/services/api-server @pcrespov
1717
/services/catalog @pcrespov
1818
/services/sidecar @pcrespov, @mguidon
1919
/services/web/client @odeimaiz, @oetiker, @ignapas

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

+20-11
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
- name: test
5757
run: ./ci/github/unit-testing/api.bash test
5858

59-
unit-test-api-gateway:
60-
name: Unit-testing api-gateway
59+
unit-test-api-server:
60+
name: Unit-testing api-server
6161
runs-on: ${{ matrix.os }}
6262
strategy:
6363
matrix:
@@ -86,22 +86,22 @@ jobs:
8686
restore-keys: |
8787
${{ runner.os }}-pip-
8888
- name: install
89-
run: ./ci/github/unit-testing/api-gateway.bash install
89+
run: ./ci/github/unit-testing/api-server.bash install
9090
- name: test
91-
run: ./ci/github/unit-testing/api-gateway.bash test
91+
run: ./ci/github/unit-testing/api-server.bash test
9292
- uses: codecov/codecov-action@v1
9393
with:
9494
flags: unittests #optional
9595
- name: prepare codeclimate coverage file
9696
run: |
9797
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
9898
chmod +x ./cc-test-reporter
99-
./cc-test-reporter format-coverage -t coverage.py -o codeclimate.unit_api_gateway_coverage.json coverage.xml
99+
./cc-test-reporter format-coverage -t coverage.py -o codeclimate.unit_api_server_coverage.json coverage.xml
100100
- name: upload codeclimate coverage
101101
uses: actions/upload-artifact@v1
102102
with:
103-
name: unit_api_gateway_coverage
104-
path: codeclimate.unit_api_gateway_coverage.json
103+
name: unit_api_server_coverage
104+
path: codeclimate.unit_api_server_coverage.json
105105

106106
unit-test-catalog:
107107
name: Unit-testing catalog
@@ -748,6 +748,8 @@ jobs:
748748
run: ./ci/github/system-testing/swarm-deploy.bash clean_up
749749

750750
system-test-e2e:
751+
# FIXME: skip the job until make it faster and more reliable
752+
# https://github.com/ITISFoundation/osparc-simcore/issues/1594
751753
name: System-testing e2e
752754
needs: [build-test-images]
753755
runs-on: ${{ matrix.os }}
@@ -794,8 +796,15 @@ jobs:
794796
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
795797
restore-keys: |
796798
${{ runner.os }}-node-
797-
- name: install
798-
run: ./ci/github/system-testing/e2e.bash install
799+
- name: setup images
800+
run: ./ci/github/system-testing/e2e.bash setup_images
801+
- name: setup environment
802+
run: ./ci/github/system-testing/e2e.bash setup_environment
803+
- name: setup registry
804+
run: ./ci/github/system-testing/e2e.bash setup_registry
805+
- name: setup database
806+
timeout-minutes: 2
807+
run: ./ci/github/system-testing/e2e.bash setup_database
799808
- name: test
800809
run: ./ci/github/system-testing/e2e.bash test
801810
- name: recover docker logs
@@ -838,7 +847,7 @@ jobs:
838847
- uses: actions/checkout@v2
839848
- uses: actions/download-artifact@v1
840849
with:
841-
name: unit_api_gateway_coverage
850+
name: unit_api_server_coverage
842851
- uses: actions/download-artifact@v1
843852
with:
844853
name: unit_catalog_coverage
@@ -873,7 +882,7 @@ jobs:
873882
run: |
874883
mkdir all_coverages
875884
cp \
876-
unit_api_gateway_coverage/*.json \
885+
unit_api_server_coverage/*.json \
877886
unit_catalog_coverage/*.json \
878887
unit_director_coverage/*.json \
879888
unit_sidecar_coverage/*.json \

.gitignore

+6-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ ENV/
110110
node_modules/
111111

112112
# IDEs config
113-
.vscode/
113+
.vscode/launch.json
114+
.vscode/settings.json
114115

115116
# Manual overrides
116117
services/docker-compose.override.yml
@@ -150,3 +151,7 @@ prof/
150151

151152
# outputs from make
152153
.stack-*.yml
154+
155+
156+
# Copies
157+
services/**/.codeclimate.yml

.pylintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# A comma-separated list of package or module names from where C extensions may
44
# be loaded. Extensions are loading into the active Python interpreter and may
55
# run arbitrary code
6-
extension-pkg-whitelist=
6+
extension-pkg-whitelist=pydantic
77

88
# Add files or directories to the blacklist. They should be base names, not
99
# paths.

.travis.yml

+14-43
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ jobs:
107107
after_failure:
108108
- unbuffer bash ci/travis/unit-testing/webserver.bash after_failure
109109

110-
# test python, api-gateway ----------------------------------------------------------------------
110+
# test python, api-server ----------------------------------------------------------------------
111111
- stage: build / unit-testing
112-
name: api-gateway
112+
name: api-server
113113
language: python
114114
python:
115115
- "3.6"
@@ -118,17 +118,17 @@ jobs:
118118
- docker
119119
cache: pip
120120
before_install:
121-
- sudo bash ci/travis/unit-testing/api-gateway.bash before_install
121+
- sudo bash ci/travis/unit-testing/api-server.bash before_install
122122
install:
123-
- unbuffer bash ci/travis/unit-testing/api-gateway.bash install
123+
- unbuffer bash ci/travis/unit-testing/api-server.bash install
124124
before_script:
125-
- unbuffer bash ci/travis/unit-testing/api-gateway.bash before_script
125+
- unbuffer bash ci/travis/unit-testing/api-server.bash before_script
126126
script:
127-
- unbuffer bash ci/travis/unit-testing/api-gateway.bash script
127+
- unbuffer bash ci/travis/unit-testing/api-server.bash script
128128
after_success:
129-
- unbuffer bash ci/travis/unit-testing/api-gateway.bash after_success
129+
- unbuffer bash ci/travis/unit-testing/api-server.bash after_success
130130
after_failure:
131-
- unbuffer bash ci/travis/unit-testing/api-gateway.bash after_failure
131+
- unbuffer bash ci/travis/unit-testing/api-server.bash after_failure
132132

133133
# test python, catalog ----------------------------------------------------------------------
134134
- stage: build / unit-testing
@@ -385,41 +385,7 @@ jobs:
385385
after_failure:
386386
- unbuffer bash ci/travis/system-testing/swarm-deploy.bash after_failure
387387

388-
# system testing e2e testing -----------------------------------------------------------------
389-
# https://github.com/GoogleChrome/puppeteer/blob/master/docs/troubleshooting.md#running-puppeteer-on-travis-ci
390-
- stage: integration-testing / system-testing
391-
name: e2e testing
392-
language: node_js
393-
node_js:
394-
- "10"
395-
sudo: required
396-
services:
397-
- xvfb
398-
addons:
399-
apt:
400-
packages:
401-
- libnss3 # This is required to run new chrome on old trusty
402-
- expect-dev # for unbuffer: brings color back into travis logs
403-
- docker-ce
404-
- python3-venv
405-
notifications:
406-
email: false
407-
cache:
408-
directories:
409-
- node_modules
410-
before_install:
411-
- sudo bash ci/travis/system-testing/e2e.bash before_install
412-
install:
413-
- unbuffer bash ci/travis/system-testing/e2e.bash install
414-
before_script:
415-
- unbuffer bash ci/travis/system-testing/e2e.bash before_script
416-
script:
417-
- unbuffer bash ci/travis/system-testing/e2e.bash script
418-
after_success:
419-
- unbuffer bash ci/travis/system-testing/e2e.bash after_success
420-
after_failure:
421-
- unbuffer bash ci/travis/system-testing/e2e.bash after_failure
422-
388+
# deployment in master environ ----------------------------------------------------------------
423389
- stage: deployment
424390
name: master
425391
if: branch = master
@@ -434,6 +400,8 @@ jobs:
434400
script: unbuffer bash ci/deploy/dockerhub-deploy.bash
435401
on:
436402
branch: master
403+
404+
# deployment to staging environ ----------------------------------------------------------------
437405
- stage: deployment
438406
name: staging
439407
if: branch = staging
@@ -448,6 +416,8 @@ jobs:
448416
script: unbuffer bash ci/deploy/dockerhub-deploy.bash
449417
on:
450418
branch: staging
419+
420+
# deployment to production environ ----------------------------------------------------------------
451421
- stage: deployment
452422
name: production/release
453423
env:
@@ -464,6 +434,7 @@ jobs:
464434
all_branches: true
465435
tags: true
466436
condition: $TRAVIS_TAG =~ ^v[0-9]+.[0-9]+.[0-9]+$
437+
467438
notifications:
468439
email:
469440
on_success: never

.vscode-template/README.md

-42
This file was deleted.

.vscode-template/launch.json renamed to .vscode/launch.template.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// This is a template. Clone and replace extension ".template.json" by ".json"
12
{
23
// Use IntelliSense to learn about possible attributes.
34
// Hover to view descriptions of existing attributes.
@@ -43,6 +44,19 @@
4344
}
4445
]
4546
},
47+
{
48+
"name": "Python: Remote Attach sidecar_gpu",
49+
"type": "python",
50+
"request": "attach",
51+
"port": 3007,
52+
"host": "127.0.0.1",
53+
"pathMappings": [
54+
{
55+
"localRoot": "${workspaceFolder}",
56+
"remoteRoot": "/devel"
57+
}
58+
]
59+
},
4660
{
4761
"name": "Python: Remote Attach storage",
4862
"type": "python",
@@ -86,4 +100,4 @@
86100
"port": 9229
87101
}
88102
]
89-
}
103+
}

.vscode-template/settings.json renamed to .vscode/settings.template.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// This is a template. Clone and replace extension ".template.json" by ".json"
12
{
23
"editor.tabSize": 2,
34
"editor.insertSpaces": true,
@@ -34,4 +35,4 @@
3435
"shellcheck.run": "onSave",
3536
"shellcheck.enableQuickFix": true,
3637
"python.formatting.provider": "black"
37-
}
38+
}

0 commit comments

Comments
 (0)