Merge branch 'master' into is353/api-params-table

services/api-server/requirements/_base.in

@@ -15,22 +15,14 @@
 --requirement ../../../packages/service-library/requirements/_base.in
 --requirement ../../../packages/service-library/requirements/_fastapi.in
 
-
-# fastapi and extensions
-fastapi[all]
-
-# data models
-pydantic[dotenv]
-
-# database
+aiofiles
 aiopg[sa]
-
-# web client
-httpx
-
-#
-importlib_resources
-attrs
-tenacity
 cryptography
+fastapi[all]
+httpx
+orjson
 packaging
+pydantic[dotenv]
+pyyaml
+tenacity
+typer

services/api-server/requirements/_base.txt

@@ -4,18 +4,19 @@
 #
 #    pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in
 #
-aiodebug==1.1.2
+aiodebug==2.3.0
     # via
     #   -c requirements/../../../packages/service-library/requirements/./_base.in
     #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
-aiofiles==0.5.0
+aiofiles==0.8.0
     # via
     #   -c requirements/../../../packages/service-library/requirements/./_base.in
     #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/simcore-sdk/requirements/_base.in
-aiohttp==3.7.4.post0
+    #   -r requirements/_base.in
+aiohttp==3.8.1
     # via
     #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
@@ -27,23 +28,24 @@ aiohttp==3.7.4.post0
     #   -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../requirements/constraints.txt
-    #   -c requirements/./constraints.txt
     #   -r requirements/../../../packages/simcore-sdk/requirements/_base.in
-aiopg==1.2.1
+aiopg==1.3.3
     # via
     #   -r requirements/../../../packages/simcore-sdk/requirements/_base.in
     #   -r requirements/_base.in
-alembic==1.7.4
+aiosignal==1.2.0
+    # via aiohttp
+alembic==1.7.6
     # via
     #   -r requirements/../../../packages/postgres-database/requirements/_base.in
     #   -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
 anyio==3.5.0
     # via
     #   httpcore
     #   starlette
-asgiref==3.4.1
+asgiref==3.5.0
     # via uvicorn
-async-timeout==3.0.1
+async-timeout==4.0.2
     # via
     #   aiohttp
     #   aiopg
@@ -52,26 +54,25 @@ attrs==20.3.0
     #   -c requirements/../../../packages/service-library/requirements/././constraints.txt
     #   -c requirements/../../../packages/service-library/requirements/./constraints.txt
     #   -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt
-    #   -r requirements/_base.in
     #   aiohttp
-certifi==2020.12.5
+    #   jsonschema
+certifi==2021.10.8
     # via
     #   httpcore
     #   httpx
     #   requests
-cffi==1.14.5
+cffi==1.15.0
     # via cryptography
-chardet==4.0.0
+charset-normalizer==2.0.12
     # via
     #   aiohttp
+    #   httpx
     #   requests
-charset-normalizer==2.0.10
-    # via httpx
-click==8.0.3
+click==8.0.4
     # via
     #   typer
     #   uvicorn
-cryptography==3.4.7
+cryptography==36.0.1
     # via
     #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
@@ -84,28 +85,32 @@ cryptography==3.4.7
     #   -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/_base.in
-dnspython==2.1.0
+dnspython==2.2.0
     # via email-validator
-email-validator==1.1.2
+email-validator==1.1.3
     # via
     #   fastapi
     #   pydantic
-fastapi==0.71.0
+fastapi==0.74.1
     # via
     #   -r requirements/../../../packages/service-library/requirements/_fastapi.in
     #   -r requirements/_base.in
     #   fastapi-contrib
 fastapi-contrib==0.2.11
     # via -r requirements/../../../packages/service-library/requirements/_fastapi.in
+frozenlist==1.3.0
+    # via
+    #   aiohttp
+    #   aiosignal
 h11==0.12.0
     # via
     #   httpcore
     #   uvicorn
-httpcore==0.14.4
+httpcore==0.14.7
     # via httpx
 httptools==0.2.0
     # via uvicorn
-httpx==0.21.3
+httpx==0.22.0
     # via -r requirements/_base.in
 idna==2.10
     # via
@@ -121,9 +126,9 @@ idna==2.10
     #   requests
     #   rfc3986
     #   yarl
-importlib-metadata==4.8.1
+importlib-metadata==4.11.2
     # via alembic
-importlib-resources==5.3.0 ; python_version < "3.9"
+importlib-resources==5.4.0 ; python_version < "3.9"
     # via
     #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
@@ -135,13 +140,12 @@ importlib-resources==5.3.0 ; python_version < "3.9"
     #   -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../requirements/constraints.txt
-    #   -r requirements/_base.in
     #   alembic
-itsdangerous==1.1.0
+itsdangerous==2.1.0
     # via fastapi
 jaeger-client==4.8.0
     # via fastapi-contrib
-jinja2==2.11.3
+jinja2==3.0.3
     # via
     #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
@@ -154,31 +158,39 @@ jinja2==2.11.3
     #   -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../requirements/constraints.txt
     #   fastapi
-mako==1.1.5
+jsonschema==3.2.0
+    # via
+    #   -c requirements/../../../packages/service-library/requirements/././constraints.txt
+    #   -c requirements/../../../packages/service-library/requirements/./constraints.txt
+    #   -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/./constraints.txt
+    #   -r requirements/../../../packages/simcore-sdk/requirements/_base.in
+mako==1.1.6
     # via alembic
-markupsafe==2.0.1
+markupsafe==2.1.0
     # via
     #   jinja2
     #   mako
-multidict==5.1.0
+multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
 opentracing==2.4.0
     # via
     #   fastapi-contrib
     #   jaeger-client
-orjson==3.5.2
-    # via fastapi
-packaging==20.9
+orjson==3.6.7
+    # via
+    #   -r requirements/_base.in
+    #   fastapi
+packaging==21.3
     # via
     #   -r requirements/../../../packages/simcore-sdk/requirements/_base.in
     #   -r requirements/_base.in
-psycopg2-binary==2.9.1
+psycopg2-binary==2.9.3
     # via
     #   aiopg
     #   sqlalchemy
-pycparser==2.20
+pycparser==2.21
     # via cffi
 pydantic==1.9.0
     # via
@@ -201,16 +213,16 @@ pydantic==1.9.0
     #   -r requirements/../../../packages/simcore-sdk/requirements/_base.in
     #   -r requirements/_base.in
     #   fastapi
-pyinstrument==3.4.2
+pyinstrument==4.1.1
     # via
     #   -c requirements/../../../packages/service-library/requirements/./_base.in
     #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
-pyinstrument-cext==0.2.4
-    # via pyinstrument
-pyparsing==2.4.7
+pyparsing==3.0.7
     # via packaging
-python-dotenv==0.17.1
+pyrsistent==0.18.1
+    # via jsonschema
+python-dotenv==0.19.2
     # via
     #   pydantic
     #   uvicorn
@@ -234,16 +246,17 @@ pyyaml==5.4.1
     #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
+    #   -r requirements/_base.in
     #   fastapi
     #   uvicorn
-requests==2.25.1
+requests==2.27.1
     # via fastapi
 rfc3986==1.5.0
     # via httpx
 six==1.16.0
     # via
+    #   jsonschema
     #   python-multipart
-    #   tenacity
     #   thrift
 sniffio==1.2.0
     # via
@@ -268,7 +281,7 @@ sqlalchemy==1.3.24
     #   alembic
 starlette==0.17.1
     # via fastapi
-tenacity==7.0.0
+tenacity==8.0.1
     # via
     #   -c requirements/../../../packages/service-library/requirements/./_base.in
     #   -r requirements/../../../packages/service-library/requirements/_base.in
@@ -277,23 +290,25 @@ tenacity==7.0.0
     #   -r requirements/_base.in
 threadloop==1.0.2
     # via jaeger-client
-thrift==0.13.0
+thrift==0.15.0
     # via jaeger-client
 tornado==6.1
     # via
     #   jaeger-client
     #   threadloop
-tqdm==4.60.0
+tqdm==4.63.0
     # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in
 typer==0.4.0
-    # via -r requirements/../../../packages/settings-library/requirements/_base.in
-typing-extensions==3.10.0.2
     # via
-    #   aiohttp
+    #   -r requirements/../../../packages/settings-library/requirements/_base.in
+    #   -r requirements/_base.in
+typing-extensions==4.1.1
+    # via
+    #   aiodebug
     #   pydantic
-ujson==4.0.2
+ujson==4.3.0
     # via fastapi
-urllib3==1.26.7
+urllib3==1.26.8
     # via
     #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
@@ -308,18 +323,21 @@ urllib3==1.26.7
     #   requests
 uvicorn==0.15.0
     # via fastapi
-uvloop==0.14.0
+uvloop==0.16.0
     # via uvicorn
 watchgod==0.7
     # via uvicorn
-websockets==10.1
+websockets==10.2
     # via uvicorn
-yarl==1.6.3
+yarl==1.7.2
     # via
     #   -r requirements/../../../packages/postgres-database/requirements/_base.in
     #   -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in
     #   aiohttp
-zipp==3.6.0
+zipp==3.7.0
     # via
     #   importlib-metadata
     #   importlib-resources
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools