Merge remote-tracking branch 'upstream/master'

ITISFoundation · Nov 2, 2018 · d423dcc · d423dcc
2 parents 6ca6aad + dfdd594
commit d423dcc
Show file tree

Hide file tree

Showing 130 changed files with 2,199 additions and 5,093 deletions.
diff --git a/.env-devel b/.env-devel
@@ -5,6 +5,7 @@ DOCKER_GID=1001
 RUN_DOCKER_ENGINE_ROOT=0
 #--------
 OSPARC_PUBLIC_URL=http://osparc01.itis.ethz.ch:9081
+PUBLISHED_HOST_NAME=osparc01.itis.ethz.ch
 POSTGRES_ENDPOINT=postgres:5432
 POSTGRES_USER=simcore
 POSTGRES_PASSWORD=simcore

diff --git a/Makefile b/Makefile
@@ -117,7 +117,7 @@ test:
 	make run_test
 	make after_test
 
-PLATFORM_VERSION=3.18
+PLATFORM_VERSION=3.19
 
 push_platform_images:
 	${DOCKER} login masu.speag.com

diff --git a/README.md b/README.md
@@ -1,7 +1,9 @@
 # osparc-simcore platform
 
+[![Waffle.io - Columns and their card count](https://badge.waffle.io/ITISFoundation/osparc-simcore.svg?columns=Backlog,In%20Progress,Review,Done)](https://waffle.io/ITISFoundation/osparc-simcore)
 [![Build Status](https://travis-ci.org/ITISFoundation/osparc-simcore.svg?branch=master)](https://travis-ci.org/ITISFoundation/osparc-simcore)
-[![Waffle.io - Columns and their card count](https://badge.waffle.io/ITISFoundation/osparc-simcore.svg?columns=all)](https://waffle.io/ITISFoundation/osparc-simcore)
+[![Requirements Status](https://requires.io/github/ITISFoundation/osparc-simcore/requirements.svg?branch=master)](https://requires.io/github/ITISFoundation/osparc-simcore/requirements/?branch=master)
+
 
 ## Overview
 
@@ -31,12 +33,5 @@
 ```
 
 
-## Development
-
-- To run linters in host machine
-
-```bash
-  make pylint
-```
 
 **WARNING** This application is still under development and still not suitable for production purposes.
diff --git a/docs/comp-services.md b/docs/comp-services.md
@@ -22,7 +22,7 @@ All nodes are described with the following data structure:
 
 ```json
 {
-  "pipeline_id" : uid,
+  "project_id" : uid,
   "node_id" : uid,
   "image" : {
     "name" : dockerregistry.module.name
@@ -73,7 +73,7 @@ Two tables are created, one to represent the dag and one to represent every node
 Every link to an node A is represented as follows:
 
 ``
-pipeline_id.nodeA_id.key
+project_id.nodeA_id.key
 ``
 
 This handles the case of files and values.

diff --git a/packages/deploy-tools/Makefile b/packages/deploy-tools/Makefile
diff --git a/packages/deploy-tools/README.md b/packages/deploy-tools/README.md
diff --git a/packages/deploy-tools/requirements.txt b/packages/deploy-tools/requirements.txt
diff --git a/packages/deploy-tools/setup.py b/packages/deploy-tools/setup.py
diff --git a/packages/deploy-tools/src/deploytools/__init__.py b/packages/deploy-tools/src/deploytools/__init__.py
diff --git a/packages/deploy-tools/src/deploytools/cli.py b/packages/deploy-tools/src/deploytools/cli.py
diff --git a/packages/deploy-tools/src/deploytools/merge.py b/packages/deploy-tools/src/deploytools/merge.py
diff --git a/packages/deploy-tools/src/deploytools/readers.py b/packages/deploy-tools/src/deploytools/readers.py
diff --git a/packages/deploy-tools/src/deploytools/swarm_composer.py b/packages/deploy-tools/src/deploytools/swarm_composer.py