[Maintenance] package reqs update and extended invitation lifetime

Makefile

@@ -466,3 +466,10 @@ postgres-upgrade: ## initalize or upgrade postgres db to latest state
 .PHONY: reset
 reset: ## restart docker daemon (LINUX ONLY)
 	sudo systemctl restart docker
+
+.PHONY: auto-doc
+auto-doc: .stack-simcore-version.yml ## updates diagrams for README.md
+	# Parsing docker-compose config $< and creating graph
+	@./scripts/docker-compose-viz.bash $<
+	# Updating docs/img
+	@mv --verbose $<.png docs/img/

README.md

@@ -4,40 +4,33 @@
 
 <!-- NOTE: when branched replace `master` in urls -->
 [`master`](https://github.com/itisfoundation/osparc-simcore/tree/master)
+[![Code style: black]](https://github.com/psf/black)
 [![Requires.io]](https://requires.io/github/ITISFoundation/osparc-simcore/requirements/?branch=master "State of third party python dependencies")
 [![travis-ci]](https://travis-ci.org/ITISFoundation/osparc-simcore "State of CI: build, test and pushing images")
-[![coverals.io]](https://coveralls.io/github/ITISFoundation/osparc-simcore?branch=master "Test coverage")
+![Github-CI Push/PR](https://github.com/ITISFoundation/osparc-simcore/workflows/Github-CI%20Push/PR/badge.svg)
+[![coveralls.io]](https://coveralls.io/github/ITISFoundation/osparc-simcore?branch=master)
+[![codecov.io]](https://codecov.io/gh/ITISFoundation/osparc-simcore)
 [![github.io]](https://itisfoundation.github.io/)
 [![itis.dockerhub]](https://hub.docker.com/u/itisfoundation)
 
 
-<!-- THIS SERVICE MALFUNCTIONS
-[![webserver]](https://microbadger.com/images/itisfoundation/webserver "More on itisfoundation/webserver:staging-latest image")
-[![director]](https://microbadger.com/images/itisfoundation/director "More on itisfoundation/director:staging-latest image")
-[![sidecar]](https://microbadger.com/images/itisfoundation/sidecar "More on itisfoundation/sidecar:staging-latest image")
-[![storage]](https://microbadger.com/images/itisfoundation/storage "More on itisfoundation/storage:staging-latest image")
--->
-
 
 <!-- ADD HERE ALL BADGE URLS -->
+[Code style: black]:https://img.shields.io/badge/code%20style-black-000000.svg
 [Requires.io]:https://img.shields.io/requires/github/ITISFoundation/osparc-simcore.svg
 [travis-ci]:https://travis-ci.org/ITISFoundation/osparc-simcore.svg?branch=master
-[coverals.io]:https://coveralls.io/repos/github/ITISFoundation/osparc-simcore/badge.svg?branch=master
 [github.io]:https://img.shields.io/website-up-down-green-red/https/itisfoundation.github.io.svg?label=documentation
 [itis.dockerhub]:https://img.shields.io/website/https/hub.docker.com/u/itisfoundation.svg?down_color=red&label=dockerhub%20repos&up_color=green
-[webserver]:https://img.shields.io/microbadger/image-size/itisfoundation/webserver/staging-latest.svg?label=webserver&style=flat
-[director]:https://img.shields.io/microbadger/image-size/itisfoundation/director/staging-latest.svg?label=director&style=flat
-[sidecar]:https://img.shields.io/microbadger/image-size/itisfoundation/sidecar/staging-latest.svg?label=sidecar&style=flat
-[storage]:https://img.shields.io/microbadger/image-size/itisfoundation/storage/staging-latest.svg?label=storage&style=flat
+[coveralls.io]:https://coveralls.io/repos/github/ITISFoundation/osparc-simcore/badge.svg?branch=master
+[codecov.io]:https://codecov.io/gh/ITISFoundation/osparc-simcore/branch/master/graph/badge.svg
+
 <!---------------------------->
 
 ## Overview
 
-![service-web](docs/img/service-interaction.svg)
-
+simcore-stack when deployed locally:
 
-A graph view of services, ports, volumes and service dependencies:
-![](docs/img/docker-compose-wo-networks.png)
+![](docs/img/.stack-simcore-version.yml.png)
 
 ## Usage
 

ci/github/unit-testing/python-linting.bash

@@ -5,11 +5,8 @@ IFS=$'\n\t'
 
 install() {
     bash ci/helpers/ensure_python_pip.bash
-    pip3 install pylint~=2.0
-    # Minimal packages to pass linter
-    pip install celery docker
+    bash ci/helpers/install_pylint.bash
     pip list -v
-    pylint --version
 }
 
 test() {

ci/helpers/install_pylint.bash

@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+#  Installs pylint using same version as servicelib
+#
+
+# http://redsymbol.net/articles/unofficial-bash-strict-mode/
+set -euo pipefail
+IFS=$'\n\t'
+
+REQUIREMENTS=packages/service-library/requirements/_test.txt
+PYLINT_VERSION="$(grep pylint== $REQUIREMENTS | awk '{print $1}')"
+pip3 install "$PYLINT_VERSION"
+
+# Minimal packages to pass linter
+pip install \
+  celery\
+  docker
+
+
+echo "INFO:" "$(pylint --version)" "@" "$(command -v pylint)"

ci/travis/unit-testing/python-linting.bash

@@ -16,9 +16,8 @@ install() {
     if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}";
     then
         bash ci/helpers/ensure_python_pip.bash
-        pip3 install pylint~=2.0
-        # Minimal packages to pass linter
-        pip install celery docker
+        bash ci/helpers/install_pylint.bash
+        pip list -v
     fi
 }
 

docs/simcore-stack.md

@@ -1,21 +1,15 @@
 # simcore stack
 
 
-Different views of the stack configuration
 
+```cmd
+$ make .stack-simcore-version.yml
+$ ./scripts/docker-compose-viz.bash .stack-simcore-version.yml
+$ mv .stack-simcore-version.yml.png docs/img/
+```
 
-![](img/docker-compose-wo-networks.png)
+![](img/.stack-simcore-version.yml.png)
 
----
-
-![](img/docker-compose-w-ports.png)
-
----
-
-![](img/docker-compose.png)
-
-
----
 
 
 Diagrams of the [osparc-ops stacks](https://github.com/pcrespov/osparc-ops/blob/enh/documentation/docs/stacks-graph.md)

packages/postgres-database/requirements/_base.txt

@@ -2,10 +2,10 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=_base.txt _base.in
+#    pip-compile --output-file=requirements/_base.txt requirements/_base.in
 #
 idna==2.9                 # via yarl
 multidict==4.7.5          # via yarl
 psycopg2-binary==2.8.5    # via sqlalchemy
-sqlalchemy[postgresql_psycopg2binary]==1.3.16  # via -r _base.in
-yarl==1.4.2               # via -r _base.in
+sqlalchemy[postgresql_psycopg2binary]==1.3.16  # via -r requirements/_base.in
+yarl==1.4.2               # via -r requirements/_base.in

packages/postgres-database/requirements/_migration.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=_migration.txt _migration.in
+#    pip-compile --output-file=requirements/_migration.txt requirements/_migration.in
 #
 alembic==1.4.2            # via -r requirements/_migration.in
 certifi==2019.11.28       # via -r requirements/_migration.in, requests

packages/postgres-database/requirements/_test.in

@@ -20,5 +20,5 @@ pytest-runner
 pytest-docker
 
 # CI
-pylint
+pylint==2.5.0 # 2.5.3 fails to run in parallel
 coveralls

packages/postgres-database/requirements/_test.txt

@@ -2,12 +2,12 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=_test.txt _test.in
+#    pip-compile --output-file=requirements/_test.txt requirements/_test.in
 #
 aiohttp==3.6.2            # via pytest-aiohttp
 aiopg[sa]==1.0.0          # via -r requirements/_test.in
 alembic==1.4.2            # via -r requirements/_migration.txt
-astroid==2.4.0            # via pylint
+astroid==2.4.1            # via pylint
 async-timeout==3.0.1      # via aiohttp
 attrs==19.3.0             # via aiohttp, pytest, pytest-docker
 certifi==2019.11.28       # via -r requirements/_migration.txt, requests
@@ -18,7 +18,9 @@ coveralls==2.0.0          # via -r requirements/_test.in
 docker==4.2.0             # via -r requirements/_migration.txt
 docopt==0.6.2             # via coveralls
 faker==4.0.3              # via -r requirements/_test.in
+idna-ssl==1.1.0           # via aiohttp
 idna==2.9                 # via -r requirements/_migration.txt, requests, yarl
+importlib-metadata==1.6.0  # via pluggy, pytest
 isort==4.3.21             # via pylint
 lazy-object-proxy==1.4.3  # via astroid
 mako==1.1.2               # via -r requirements/_migration.txt, alembic
@@ -47,8 +49,11 @@ sqlalchemy[postgresql_psycopg2binary]==1.3.16  # via -r requirements/_migration.
 tenacity==6.2.0           # via -r requirements/_migration.txt
 text-unidecode==1.3       # via faker
 toml==0.10.0              # via pylint
+typed-ast==1.4.1          # via astroid
+typing-extensions==3.7.4.2  # via aiohttp
 urllib3==1.25.9           # via -r requirements/_migration.txt, requests
 wcwidth==0.1.9            # via pytest
 websocket-client==0.57.0  # via -r requirements/_migration.txt, docker
 wrapt==1.12.1             # via astroid
 yarl==1.4.2               # via -r requirements/_migration.txt, aiohttp
+zipp==3.1.0               # via importlib-metadata

packages/s3wrapper/requirements/_base.txt

@@ -2,12 +2,12 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=_base.txt _base.in
+#    pip-compile --output-file=requirements/_base.txt requirements/_base.in
 #
 certifi==2020.4.5.1       # via minio
 configparser==5.0.0       # via minio
-minio==5.0.10             # via -r _base.in
+minio==5.0.10             # via -r requirements/_base.in
 python-dateutil==2.8.1    # via minio
-pytz==2019.3              # via minio
+pytz==2020.1              # via minio
 six==1.14.0               # via python-dateutil
-urllib3==1.25.9           # via -r _base.in, minio
+urllib3==1.25.9           # via -r requirements/_base.in, minio

packages/s3wrapper/requirements/_test.in

@@ -16,5 +16,5 @@ pytest-runner
 requests
 
 # tools for CI
-pylint
+pylint==2.5.0 # 2.5.3 fails to run in parallel
 coveralls

packages/s3wrapper/requirements/_test.txt

@@ -2,39 +2,39 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=_test.txt _test.in
+#    pip-compile --output-file=requirements/_test.txt requirements/_test.in
 #
-astroid==2.4.0            # via pylint
+astroid==2.4.1            # via pylint
 attrs==19.3.0             # via pytest, pytest-docker
-certifi==2020.4.5.1       # via -r _base.txt, minio, requests
+certifi==2020.4.5.1       # via -r requirements/_base.txt, minio, requests
 chardet==3.0.4            # via requests
-configparser==5.0.0       # via -r _base.txt, minio
-coverage==5.1             # via -r _test.in, coveralls, pytest-cov
-coveralls==2.0.0          # via -r _test.in
+configparser==5.0.0       # via -r requirements/_base.txt, minio
+coverage==5.1             # via -r requirements/_test.in, coveralls, pytest-cov
+coveralls==2.0.0          # via -r requirements/_test.in
 docopt==0.6.2             # via coveralls
 idna==2.9                 # via requests
 importlib-metadata==1.6.0  # via pluggy, pytest
 isort==4.3.21             # via pylint
 lazy-object-proxy==1.4.3  # via astroid
 mccabe==0.6.1             # via pylint
-minio==5.0.10             # via -r _base.txt
+minio==5.0.10             # via -r requirements/_base.txt
 more-itertools==8.2.0     # via pytest
 packaging==20.3           # via pytest
 pluggy==0.13.1            # via pytest
 py==1.8.1                 # via pytest
-pylint==2.5.0             # via -r _test.in
+pylint==2.5.0             # via -r requirements/_test.in
 pyparsing==2.4.7          # via packaging
-pytest-cov==2.8.1         # via -r _test.in
-pytest-docker==0.7.2      # via -r _test.in
-pytest-runner==5.2        # via -r _test.in
-pytest==5.3.5             # via -r _test.in, pytest-cov
-python-dateutil==2.8.1    # via -r _base.txt, minio
-pytz==2019.3              # via -r _base.txt, minio
-requests==2.23.0          # via -r _test.in, coveralls
-six==1.14.0               # via -r _base.txt, astroid, packaging, python-dateutil
+pytest-cov==2.8.1         # via -r requirements/_test.in
+pytest-docker==0.7.2      # via -r requirements/_test.in
+pytest-runner==5.2        # via -r requirements/_test.in
+pytest==5.3.5             # via -r requirements/_test.in, pytest-cov
+python-dateutil==2.8.1    # via -r requirements/_base.txt, minio
+pytz==2020.1              # via -r requirements/_base.txt, minio
+requests==2.23.0          # via -r requirements/_test.in, coveralls
+six==1.14.0               # via -r requirements/_base.txt, astroid, packaging, python-dateutil
 toml==0.10.0              # via pylint
 typed-ast==1.4.1          # via astroid
-urllib3==1.25.9           # via -r _base.txt, minio, requests
+urllib3==1.25.9           # via -r requirements/_base.txt, minio, requests
 wcwidth==0.1.9            # via pytest
 wrapt==1.12.1             # via astroid
 zipp==3.1.0               # via importlib-metadata

packages/service-library/requirements/_base.txt

@@ -2,36 +2,36 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=_base.txt _base.in
+#    pip-compile --output-file=requirements/_base.txt requirements/_base.in
 #
-aiodebug==1.1.2           # via -r _base.in
-aiohttp==3.6.2            # via -r _base.in, aiozipkin
-aiopg[sa]==1.0.0          # via -r _base.in
-aiozipkin==0.6.0          # via -r _base.in
+aiodebug==1.1.2           # via -r requirements/_base.in
+aiohttp==3.6.2            # via -r requirements/_base.in, aiozipkin
+aiopg[sa]==1.0.0          # via -r requirements/_base.in
+aiozipkin==0.6.0          # via -r requirements/_base.in
 async-timeout==3.0.1      # via aiohttp
-attrs==19.3.0             # via -r _base.in, aiohttp, jsonschema, openapi-core
+attrs==19.3.0             # via -r requirements/_base.in, aiohttp, jsonschema, openapi-core
 chardet==3.0.4            # via aiohttp
 idna-ssl==1.1.0           # via aiohttp
 idna==2.9                 # via idna-ssl, yarl
 importlib-metadata==1.6.0  # via jsonschema
 isodate==0.6.0            # via openapi-core
-jsonschema==3.2.0         # via -r _base.in, openapi-spec-validator
+jsonschema==3.2.0         # via -r requirements/_base.in, openapi-spec-validator
 lazy-object-proxy==1.4.3  # via openapi-core
 multidict==4.7.5          # via aiohttp, yarl
-openapi-core==0.12.0      # via -r _base.in
+openapi-core==0.12.0      # via -r requirements/_base.in
 openapi-spec-validator==0.2.8  # via openapi-core
-prometheus-client==0.7.1  # via -r _base.in
-psycopg2-binary==2.8.5    # via -r _base.in, aiopg, sqlalchemy
+prometheus-client==0.7.1  # via -r requirements/_base.in
+psycopg2-binary==2.8.5    # via -r requirements/_base.in, aiopg, sqlalchemy
 pyrsistent==0.16.0        # via jsonschema
-pyyaml==5.3.1             # via -r _base.in, openapi-spec-validator
+pyyaml==5.3.1             # via -r requirements/_base.in, openapi-spec-validator
 six==1.14.0               # via isodate, jsonschema, openapi-core, openapi-spec-validator, pyrsistent, tenacity
-sqlalchemy[postgresql_psycopg2binary]==1.3.16  # via -r _base.in, aiopg
+sqlalchemy[postgresql_psycopg2binary]==1.3.16  # via -r requirements/_base.in, aiopg
 strict-rfc3339==0.7       # via openapi-core
-tenacity==6.1.0           # via -r _base.in
-trafaret==2.0.2           # via -r _base.in
+tenacity==6.2.0           # via -r requirements/_base.in
+trafaret==2.0.2           # via -r requirements/_base.in
 typing-extensions==3.7.4.2  # via aiohttp
-ujson==2.0.3              # via -r _base.in
-werkzeug==1.0.1           # via -r _base.in
+ujson==2.0.3              # via -r requirements/_base.in
+werkzeug==1.0.1           # via -r requirements/_base.in
 yarl==1.4.2               # via aiohttp
 zipp==3.1.0               # via importlib-metadata
 

packages/service-library/requirements/_test.in

@@ -7,7 +7,7 @@
 
 # testing
 coverage
-pytest~=5.3.5  # Bug in pytest-sugar https://github.com/Teemu/pytest-sugar/issues/187
+pytest~=5.3.5  # Bug in pytest-sugar https://github.com/Teemu/pytest-sugar/issues/194
 pytest-aiohttp  # incompatible with pytest-asyncio. See https://github.com/pytest-dev/pytest-asyncio/issues/76
 pytest-cov
 pytest-instafail
@@ -17,5 +17,5 @@ pytest-mock
 pytest-sugar
 
 # tools
-pylint
+pylint==2.5.0 # 2.5.3 fails to run in parallel
 coveralls