Skip to content

Commit d423dcc

Browse files
author
Pedro Crespo
committed
Merge remote-tracking branch 'upstream/master'
2 parents 6ca6aad + dfdd594 commit d423dcc

File tree

130 files changed

+2199
-5093
lines changed

Some content is hidden

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

130 files changed

+2199
-5093
lines changed

.env-devel

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ DOCKER_GID=1001
55
RUN_DOCKER_ENGINE_ROOT=0
66
#--------
77
OSPARC_PUBLIC_URL=http://osparc01.itis.ethz.ch:9081
8+
PUBLISHED_HOST_NAME=osparc01.itis.ethz.ch
89
POSTGRES_ENDPOINT=postgres:5432
910
POSTGRES_USER=simcore
1011
POSTGRES_PASSWORD=simcore

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ test:
117117
make run_test
118118
make after_test
119119

120-
PLATFORM_VERSION=3.18
120+
PLATFORM_VERSION=3.19
121121

122122
push_platform_images:
123123
${DOCKER} login masu.speag.com

README.md

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# osparc-simcore platform
22

3+
[![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)
34
[![Build Status](https://travis-ci.org/ITISFoundation/osparc-simcore.svg?branch=master)](https://travis-ci.org/ITISFoundation/osparc-simcore)
4-
[![Waffle.io - Columns and their card count](https://badge.waffle.io/ITISFoundation/osparc-simcore.svg?columns=all)](https://waffle.io/ITISFoundation/osparc-simcore)
5+
[![Requirements Status](https://requires.io/github/ITISFoundation/osparc-simcore/requirements.svg?branch=master)](https://requires.io/github/ITISFoundation/osparc-simcore/requirements/?branch=master)
6+
57

68
## Overview
79

@@ -31,12 +33,5 @@
3133
```
3234

3335

34-
## Development
35-
36-
- To run linters in host machine
37-
38-
```bash
39-
make pylint
40-
```
4136

4237
**WARNING** This application is still under development and still not suitable for production purposes.

docs/comp-services.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ All nodes are described with the following data structure:
2222

2323
```json
2424
{
25-
"pipeline_id" : uid,
25+
"project_id" : uid,
2626
"node_id" : uid,
2727
"image" : {
2828
"name" : dockerregistry.module.name
@@ -73,7 +73,7 @@ Two tables are created, one to represent the dag and one to represent every node
7373
Every link to an node A is represented as follows:
7474

7575
``
76-
pipeline_id.nodeA_id.key
76+
project_id.nodeA_id.key
7777
``
7878

7979
This handles the case of files and values.

packages/deploy-tools/Makefile

-35
This file was deleted.

packages/deploy-tools/README.md

-8
This file was deleted.

packages/deploy-tools/requirements.txt

-2
This file was deleted.

packages/deploy-tools/setup.py

-58
This file was deleted.

packages/deploy-tools/src/deploytools/__init__.py

Whitespace-only changes.

packages/deploy-tools/src/deploytools/cli.py

-13
This file was deleted.

packages/deploy-tools/src/deploytools/merge.py

-42
This file was deleted.

packages/deploy-tools/src/deploytools/readers.py

-34
This file was deleted.

packages/deploy-tools/src/deploytools/swarm_composer.py

-112
This file was deleted.

0 commit comments

Comments
 (0)