Skip to content

Commit 46dd09f

Browse files
authored
Merge pull request #1322 from ITISFoundation/FREEZE_Mithos_v2
FREEZE_Mithos_v2
2 parents 9082a78 + d9afac6 commit 46dd09f

File tree

116 files changed

+1888
-1007
lines changed

Some content is hidden

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

116 files changed

+1888
-1007
lines changed

.env-devel

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,9 @@ WEBSERVER_PROMETHEUS_PORT=9090
5555
WEBSERVER_PROMETHEUS_API_VERSION=v1
5656
WEBSERVER_RESOURCES_DELETION_TIMEOUT_SECONDS=900
5757
WEBSERVER_GARBAGE_COLLECTION_INTERVAL_SECONDS=30
58+
59+
60+
# for debugging
61+
# PYTHONTRACEMALLOC=1
62+
# PYTHONASYNCIODEBUG=1
63+
# AIODEBUG_SLOW_DURATION_SECS=0.25

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extension-pkg-whitelist=
77

88
# Add files or directories to the blacklist. They should be base names, not
99
# paths.
10-
ignore=CVS
10+
ignore=CVS,migration
1111

1212
# Add files or directories matching the regex patterns to the blacklist. The
1313
# regex matches against base names, not paths.

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ pylint: ## Runs python linter framework's wide
279279
# TODO: NOT windows friendly
280280
/bin/bash -c "pylint --jobs=0 --rcfile=.pylintrc $(strip $(shell find services packages -iname '*.py' \
281281
-not -path "*egg*" \
282+
-not -path "*migration*" \
282283
-not -path "*contrib*" \
283284
-not -path "*-sdk/python*" \
284285
-not -path "*generated_code*" \

api/specs/webserver/openapi-auth.yaml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -210,27 +210,6 @@ paths:
210210
"3XX":
211211
description: redirection to specific ui application page
212212

213-
/auth/check-password/{password}:
214-
get:
215-
summary: checks password strenght and provides recommendations to improve it
216-
tags:
217-
- authentication
218-
operationId: auth_check_password_strength
219-
parameters:
220-
- name: password
221-
in: path
222-
required: true
223-
schema:
224-
type: string
225-
# FIXME: openapi-core limitation. format: password
226-
responses:
227-
"200":
228-
description: evaluates password strength, gives a rating and suggests some improvements
229-
content:
230-
application/json:
231-
schema:
232-
$ref: "./components/schemas/auth.yaml#/PasswordCheckEnveloped"
233-
234213
components:
235214
responses:
236215
DefaultErrorResponse:

api/specs/webserver/openapi.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
openapi: 3.0.0
22
info:
33
title: "osparc-simcore RESTful API"
4-
version: 0.3.1
4+
version: 0.4.0
55
description: "RESTful API designed for web clients"
66
contact:
77
name: IT'IS Foundation
@@ -82,9 +82,6 @@ paths:
8282
/auth/confirmation/{code}:
8383
$ref: "./openapi-auth.yaml#/paths/~1auth~1confirmation~1{code}"
8484

85-
/auth/check-password/{password}:
86-
$ref: "./openapi-auth.yaml#/paths/~1auth~1check-password~1{password}"
87-
8885
# USER SETTINGS ------------------------------------------------------------------
8986

9087
/me:

ci/build/test-images

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
set -euo pipefail
44
IFS=$'\n\t'
55

6-
export DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag)
6+
DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag)
7+
export DOCKER_IMAGE_TAG
78

89
pull_images() {
910
{

ci/deploy/dockerhub-deploy

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,22 @@ if [ ! -v TAG_PREFIX ]; then
1212
fi
1313

1414
# pull the current tested build
15-
export DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag)
15+
DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag)
16+
export DOCKER_IMAGE_TAG
1617
make pull-version tag-local
1718

1819
# show current images on system
1920
echo "## Before push"
2021
make info-images
2122

2223
# re-tag build
23-
export DOCKER_IMAGE_TAG="$TAG_PREFIX-latest"
24+
DOCKER_IMAGE_TAG="$TAG_PREFIX-latest"
25+
export DOCKER_IMAGE_TAG
2426
make push-version
2527

2628
# re-tag build to master-github-DATE.GIT_SHA
27-
export DOCKER_IMAGE_TAG=$TAG_PREFIX-$(date --utc +"%Y-%m-%d--%H-%M").$(git rev-parse HEAD)
29+
DOCKER_IMAGE_TAG=$TAG_PREFIX-$(date --utc +"%Y-%m-%d--%H-%M").$(git rev-parse HEAD)
30+
export DOCKER_IMAGE_TAG
2831
make push-version
2932

3033
# show update of images on system

ci/deploy/dockerhub-release

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@ export ORG=${DOCKER_REGISTRY}
1717
export REPO="webserver"
1818
# staging-github-DATE.GIT_SHA
1919
export TAG_PATTERN="^${TAG_PREFIX}-.+\..+"
20-
export DOCKER_IMAGE_TAG=$(./ci/helpers/find_staging_version | awk 'END{print}') || exit $?
20+
DOCKER_IMAGE_TAG=$(./ci/helpers/find_staging_version | awk 'END{print}') || exit $?
21+
export DOCKER_IMAGE_TAG
2122
make pull-version tag-local
2223

2324
# show current images on system
2425
echo "## Before push"
2526
make info-images
2627

2728
# re-tag staging to {GIT_TAG}-DATE.GIT_SHA
28-
export DOCKER_IMAGE_TAG=${GIT_TAG}-$(date --utc +"%Y-%m-%d--%H-%M").$(git rev-parse HEAD)
29+
DOCKER_IMAGE_TAG=${GIT_TAG}-$(date --utc +"%Y-%m-%d--%H-%M").$(git rev-parse HEAD)
30+
export DOCKER_IMAGE_TAG
2931
make push-version push-latest
3032

3133
echo "## After push"

ci/deploy/dockerhub-test-images

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ IFS=$'\n\t'
66
bash ci/helpers/dockerhub_login
77

88
# define the local image tag
9-
export DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag)
9+
DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag)
10+
export DOCKER_IMAGE_TAG
1011

1112
# push the local cache
1213
make push-cache

ci/github/integration-testing/simcore-sdk

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@ set -euo pipefail
33
IFS=$'\n\t'
44

55
# in case it's a Pull request, the env are never available, default to itisfoundation to get a maybe not too old version for caching
6-
export DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag)
7-
8-
FOLDER_CHECKS=(packages/ simcore-sdk storage/ simcore-sdk .travis.yml)
6+
DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag)
7+
export DOCKER_IMAGE_TAG
98

109
install() {
1110
bash ci/helpers/ensure_python_pip
1211
pushd packages/simcore-sdk; pip3 install -r requirements/ci.txt; popd;
1312
pip list -v
1413
# pull the test images if registry is set up, else build the images
15-
make pull-version || ((make pull-cache || true) && make build tag-version)
14+
make pull-version || ( (make pull-cache || true) && make build tag-version)
1615
make info-images
1716
# pip3 install services/storage/client-sdk/python
1817
}

0 commit comments

Comments
 (0)