Revert "version 2.0.0" changes (#142)

reverted changes and preparing for python upgrade

Author: GitHK

.cookiecutterrc

@@ -35,4 +35,4 @@ default_context:
     project_slug:              'osparc-python-runner'
     project_type:              'computational'
     release_date:              '2020'
-    version:                   '2.0.0'
+    version:                   '1.4.0'

.github/workflows/github-ci.yml

@@ -1,27 +1,6 @@
 name: build/deploy osparc-python-runner
 
-on:
-  push:
-    branches:
-      - "*"
-    tags-ignore:
-      - "*"
-    paths-ignore:
-      - "*.md"
-      - "*.png"
-      - "*.svg"
-      - "docs/**"
-      - ".vscode/**"
-  pull_request:
-    branches:
-      - "*"
-    paths-ignore:
-      - "*.md"
-      - "*.png"
-      - "*.svg"
-      - "docs/**"
-      - ".vscode/**"
-      - ".vscode-template/**"
+on: ["push", "pull_request"]
 
 env:
   # secrets can be set in settings/secrets on github
@@ -36,7 +15,7 @@ jobs:
     strategy:
       matrix:
         python: ["3.8"]
-        os: [ubuntu-20.04]
+        os: [ubuntu-22.04]
         node: [10]
       fail-fast: false
     steps:
@@ -85,3 +64,4 @@ jobs:
         run: |
           ./ci/helpers/dockerhub_login.bash
           make push-version
+

VERSION

@@ -1 +1 @@
-2.0.0
+1.4.0

VERSION_INTEGRATION

@@ -1 +1 @@
-1.1.0
+1.0.0

docker-compose-meta.yml

@@ -17,21 +17,24 @@ services:
           input data file", "type": "data:*/*"}, "input_5": {"displayOrder": 5, "label":
           "Additional input data - optional", "description": "Any additional input
           data file", "type": "data:*/*"}}}'
-        io.simcore.integration-version: '{"integration-version": "1.1.0"}'
+        io.simcore.integration-version: '{"integration-version": "1.0.0"}'
         io.simcore.key: '{"key": "simcore/services/comp/osparc-python-runner"}'
         io.simcore.name: '{"name": "oSparc Python Runner"}'
         io.simcore.outputs: '{"outputs": {"output_1": {"displayOrder": 1, "label":
           "Output data", "description": "The data produced by the script and saved
-          under OUTPUT_FOLDER/output_1 as output_1.zip", "type": "data:*/*"}, "output_2":
-          {"displayOrder": 2, "label": "Output data", "description": "The data produced
-          by the script and saved under OUTPUT_FOLDER/output_2 as output_2.zip", "type":
-          "data:*/*"}, "output_3": {"displayOrder": 3, "label": "Output data", "description":
-          "The data produced by the script and saved under OUTPUT_FOLDER/output_3
-          as output_3.zip", "type": "data:*/*"}, "output_4": {"displayOrder": 4, "label":
+          under OUTPUT_FOLDER/output_1 as output_1.zip", "type": "data:*/*", "fileToKeyMap":
+          {"output_1.zip": "output_1"}}, "output_2": {"displayOrder": 2, "label":
           "Output data", "description": "The data produced by the script and saved
-          under OUTPUT_FOLDER/output_4 as output_4.zip", "type": "data:*/*"}}}'
+          under OUTPUT_FOLDER/output_2 as output_2.zip", "type": "data:*/*", "fileToKeyMap":
+          {"output_2.zip": "output_2"}}, "output_3": {"displayOrder": 3, "label":
+          "Output data", "description": "The data produced by the script and saved
+          under OUTPUT_FOLDER/output_3 as output_3.zip", "type": "data:*/*", "fileToKeyMap":
+          {"output_3.zip": "output_3"}}, "output_4": {"displayOrder": 4, "label":
+          "Output data", "description": "The data produced by the script and saved
+          under OUTPUT_FOLDER/output_4 as output_4.zip", "type": "data:*/*", "fileToKeyMap":
+          {"output_4.zip": "output_4"}}}}'
         io.simcore.type: '{"type": "computational"}'
-        io.simcore.version: '{"version": "2.0.0"}'
+        io.simcore.version: '{"version": "1.4.0"}'
         org.label-schema.build-date: ${BUILD_DATE}
         org.label-schema.schema-version: '1.0'
         org.label-schema.vcs-ref: ${VCS_REF}

metadata/metadata.yml

@@ -1,8 +1,8 @@
 name: oSparc Python Runner
 key: simcore/services/comp/osparc-python-runner
 type: computational
-integration-version: 1.1.0
-version: 2.0.0
+integration-version: 1.0.0
+version: 1.4.0
 description: oSparc Python Runner
 contact: [email protected]
 authors:
@@ -44,18 +44,26 @@ outputs:
     label: Output data
     description: The data produced by the script and saved under OUTPUT_FOLDER/output_1 as output_1.zip
     type: data:*/*
+    fileToKeyMap:
+      output_1.zip: output_1
   output_2:
     displayOrder: 2
     label: Output data
     description: The data produced by the script and saved under OUTPUT_FOLDER/output_2 as output_2.zip
     type: data:*/*
+    fileToKeyMap:
+      output_2.zip: output_2
   output_3:
     displayOrder: 3
     label: Output data
     description: The data produced by the script and saved under OUTPUT_FOLDER/output_3 as output_3.zip
     type: data:*/*
+    fileToKeyMap:
+      output_3.zip: output_3
   output_4:
     displayOrder: 4
     label: Output data
     description: The data produced by the script and saved under OUTPUT_FOLDER/output_4 as output_4.zip
     type: data:*/*
+    fileToKeyMap:
+      output_4.zip: output_4

requirements.in

@@ -8,7 +8,6 @@ black
 coverage
 docker
 jsonschema
-pylint
 pytest
 pytest-cookies
 pytest-cov

requirements.txt

@@ -4,11 +4,9 @@
 #
 #    pip-compile --output-file=requirements.txt
 #
-arrow==1.2.3
+arrow==1.2.2
     # via jinja2-time
-astroid==2.15.4
-    # via pylint
-attrs==23.1.0
+attrs==21.4.0
     # via
     #   jsonschema
     #   referencing
@@ -20,48 +18,38 @@ bump2version==1.0.1
     # via bumpversion
 bumpversion==0.6.0
     # via -r requirements.in
-certifi==2023.7.22
+certifi==2021.10.8
     # via requests
-chardet==5.0.0
+chardet==4.0.0
     # via binaryornot
-charset-normalizer==2.1.1
+charset-normalizer==2.0.12
     # via requests
-click==8.1.3
+click==8.1.0
     # via
     #   black
     #   cookiecutter
 cookiecutter==2.1.1
     # via pytest-cookies
-coverage[toml]==6.4.4
+coverage[toml]==6.3.2
     # via
     #   -r requirements.in
     #   pytest-cov
-dill==0.3.6
-    # via pylint
-docker==6.1.3
+docker==6.0.0
     # via -r requirements.in
-idna==3.4
+idna==3.3
     # via requests
 iniconfig==1.1.1
     # via pytest
-isort==5.10.1
-    # via pylint
-jinja2==3.1.2
+jinja2==3.1.1
     # via
     #   cookiecutter
     #   jinja2-time
 jinja2-time==0.2.0
     # via cookiecutter
 jsonschema==4.19.0
     # via -r requirements.in
-jsonschema-specifications==2023.6.1
-    # via jsonschema
-lazy-object-proxy==1.7.1
-    # via astroid
 markupsafe==2.1.1
     # via jinja2
-mccabe==0.7.0
-    # via pylint
 mypy-extensions==0.4.3
     # via black
 packaging==23.0
@@ -70,17 +58,19 @@ packaging==23.0
     #   docker
     #   pytest
     #   pytest-sugar
-pathspec==0.10.1
+pathspec==0.9.0
+    # via black
+platformdirs==2.5.1
     # via black
-platformdirs==2.5.2
-    # via
-    #   black
-    #   pylint
 pluggy==1.0.0
     # via pytest
-pylint==2.17.3
-    # via -r requirements.in
-pytest==7.4.0
+py==1.11.0
+    # via pytest
+pyparsing==3.0.7
+    # via packaging
+pyrsistent==0.18.1
+    # via jsonschema
+pytest==7.1.3
     # via
     #   -r requirements.in
     #   pytest-cookies
@@ -100,17 +90,13 @@ pytest-sugar==0.9.7
     # via -r requirements.in
 python-dateutil==2.8.2
     # via arrow
-python-slugify==6.1.2
+python-slugify==6.1.1
     # via cookiecutter
 pyyaml==6.0.1
     # via
     #   -r requirements.in
     #   cookiecutter
-referencing==0.29.1
-    # via
-    #   jsonschema
-    #   jsonschema-specifications
-requests==2.31.0
+requests==2.27.1
     # via
     #   cookiecutter
     #   docker
@@ -120,17 +106,18 @@ rpds-py==0.8.10
     #   referencing
 six==1.16.0
     # via python-dateutil
-termcolor==2.2.0
+termcolor==1.1.0
     # via pytest-sugar
 text-unidecode==1.3
     # via python-slugify
-tomlkit==0.11.4
-    # via pylint
-urllib3==1.26.12
+tomli==2.0.1
+    # via
+    #   black
+    #   coverage
+    #   pytest
+urllib3==1.26.9
     # via
     #   docker
     #   requests
-websocket-client==1.4.1
+websocket-client==1.3.2
     # via docker
-wrapt==1.14.1
-    # via astroid

service.cli/run

@@ -19,14 +19,6 @@ INPUT_4=$INPUT_FOLDER/input_4
 export INPUT_4
 INPUT_5=$INPUT_FOLDER/input_5
 export INPUT_5
-OUTPUT_1=$OUTPUT_FOLDER/output_1
-export OUTPUT_1
-OUTPUT_2=$OUTPUT_FOLDER/output_2
-export OUTPUT_2
-OUTPUT_3=$OUTPUT_FOLDER/output_3
-export OUTPUT_3
-OUTPUT_4=$OUTPUT_FOLDER/output_4
-export OUTPUT_4
 
 exec execute.sh