Merge pull request #1550 from ITISFoundation/FREEZE_ChrigelMaurer_v2

FREEZE_ChrigelMaurer_v2

Author: sanderegg

api/tests/requirements.txt

@@ -30,7 +30,7 @@ pytest-aiohttp==0.3.0     # via -r requirements.in
 pytest-cov==2.9.0         # via -r requirements.in
 pytest-instafail==0.4.1.post0  # via -r requirements.in
 pytest-sugar==0.9.3       # via -r requirements.in
-pytest==5.4.2             # via -r requirements.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-sugar
+pytest==5.4.3             # via -r requirements.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-sugar
 pyyaml==5.3.1             # via openapi-spec-validator
 six==1.15.0               # via isodate, jsonschema, openapi-core, openapi-schema-validator, openapi-spec-validator, packaging
 strict-rfc3339==0.7       # via openapi-schema-validator

packages/postgres-database/requirements/_migration.txt

@@ -8,7 +8,7 @@ alembic==1.4.2            # via -r requirements/_migration.in
 certifi==2020.4.5.1       # via requests
 chardet==3.0.4            # via requests
 click==7.1.2              # via -r requirements/_migration.in
-docker==4.2.0             # via -r requirements/_migration.in
+docker==4.2.1             # via -r requirements/_migration.in
 idna==2.9                 # via -r requirements/_base.txt, requests, yarl
 mako==1.1.2               # via alembic
 markupsafe==1.1.1         # via mako

packages/postgres-database/requirements/_test.txt

@@ -15,7 +15,7 @@ chardet==3.0.4            # via -r requirements/_migration.txt, aiohttp, request
 click==7.1.2              # via -r requirements/_migration.txt
 coverage==5.1             # via -r requirements/_test.in, coveralls, pytest-cov
 coveralls==2.0.0          # via -r requirements/_test.in
-docker==4.2.0             # via -r requirements/_migration.txt
+docker==4.2.1             # via -r requirements/_migration.txt
 docopt==0.6.2             # via coveralls
 faker==4.1.0              # via -r requirements/_test.in
 idna-ssl==1.1.0           # via aiohttp
@@ -39,7 +39,7 @@ pytest-cov==2.9.0         # via -r requirements/_test.in
 pytest-docker==0.7.2      # via -r requirements/_test.in
 pytest-instafail==0.4.1.post0  # via -r requirements/_test.in
 pytest-runner==5.2        # via -r requirements/_test.in
-pytest==5.4.2             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail
+pytest==5.4.3             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail
 python-dateutil==2.8.1    # via -r requirements/_migration.txt, alembic, faker
 python-editor==1.0.4      # via -r requirements/_migration.txt, alembic
 pyyaml==5.3.1             # via -r requirements/_test.in

packages/s3wrapper/requirements/_test.txt

@@ -27,7 +27,7 @@ pyparsing==2.4.7          # via packaging
 pytest-cov==2.9.0         # 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.4.2             # via -r requirements/_test.in, pytest-cov
+pytest==5.4.3             # 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

packages/service-library/requirements/_base.txt

@@ -11,9 +11,7 @@ aiozipkin==0.6.0          # via -r requirements/_base.in
 async-timeout==3.0.1      # via aiohttp
 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
+idna==2.9                 # via yarl
 isodate==0.6.0            # via openapi-core
 jsonschema==3.2.0         # via -r requirements/_base.in, openapi-spec-validator
 lazy-object-proxy==1.4.3  # via openapi-core
@@ -29,11 +27,9 @@ sqlalchemy[postgresql_psycopg2binary]==1.3.17  # via -r requirements/_base.in, a
 strict-rfc3339==0.7       # via openapi-core
 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 requirements/_base.in
+ujson==3.0.0              # 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
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

packages/service-library/requirements/_test.txt

@@ -16,9 +16,9 @@ chardet==3.0.4            # via -r requirements/_base.txt, aiohttp, requests
 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-ssl==1.1.0           # via -r requirements/_base.txt, aiohttp
+idna-ssl==1.1.0           # via -r requirements/_base.txt
 idna==2.9                 # via -r requirements/_base.txt, idna-ssl, requests, yarl
-importlib-metadata==1.6.0  # via -r requirements/_base.txt, jsonschema, pluggy, pytest
+importlib-metadata==1.6.0  # via -r requirements/_base.txt
 isodate==0.6.0            # via -r requirements/_base.txt, openapi-core
 isort==4.3.21             # via pylint
 jsonschema==3.2.0         # via -r requirements/_base.txt, openapi-spec-validator
@@ -40,10 +40,10 @@ pytest-aiohttp==0.3.0     # via -r requirements/_test.in
 pytest-cov==2.9.0         # via -r requirements/_test.in
 pytest-docker==0.7.2      # via -r requirements/_test.in
 pytest-instafail==0.4.1.post0  # via -r requirements/_test.in
-pytest-mock==3.1.0        # via -r requirements/_test.in
+pytest-mock==3.1.1        # via -r requirements/_test.in
 pytest-runner==5.2        # via -r requirements/_test.in
 pytest-sugar==0.9.3       # via -r requirements/_test.in
-pytest==5.4.2             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
+pytest==5.4.3             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
 pyyaml==5.3.1             # via -r requirements/_base.txt, openapi-spec-validator
 requests==2.23.0          # via coveralls
 six==1.15.0               # via -r requirements/_base.txt, astroid, isodate, jsonschema, openapi-core, openapi-spec-validator, packaging, pyrsistent, tenacity
@@ -53,15 +53,12 @@ tenacity==6.2.0           # via -r requirements/_base.txt
 termcolor==1.1.0          # via pytest-sugar
 toml==0.10.1              # via pylint
 trafaret==2.0.2           # via -r requirements/_base.txt
-typed-ast==1.4.1          # via astroid
-typing-extensions==3.7.4.2  # via -r requirements/_base.txt, aiohttp
-ujson==2.0.3              # via -r requirements/_base.txt
+ujson==3.0.0              # via -r requirements/_base.txt
 urllib3==1.25.9           # via requests
 wcwidth==0.1.9            # via pytest
 werkzeug==1.0.1           # via -r requirements/_base.txt
 wrapt==1.12.1             # via astroid
 yarl==1.4.2               # via -r requirements/_base.txt, aiohttp
-zipp==3.1.0               # via -r requirements/_base.txt, importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

packages/simcore-sdk/requirements/_test.txt

@@ -16,7 +16,7 @@ coverage==5.1             # via -r requirements/_test.in, coveralls, pytest-cov
 coveralls==2.0.0          # via -r requirements/_test.in
 dataclasses==0.7          # via -r requirements/_base.txt, pydantic
 decorator==4.4.2          # via -r requirements/_base.txt, networkx
-docker==4.2.0             # via -r requirements/_test.in
+docker==4.2.1             # via -r requirements/_test.in
 docopt==0.6.2             # via coveralls
 idna-ssl==1.1.0           # via -r requirements/_base.txt, aiohttp
 idna==2.9                 # via -r requirements/_base.txt, idna-ssl, requests, yarl
@@ -42,7 +42,7 @@ pytest-instafail==0.4.1.post0  # via -r requirements/_test.in
 pytest-mock==3.1.0        # via -r requirements/_test.in
 pytest-runner==5.2        # via -r requirements/_test.in
 pytest-sugar==0.9.3       # via -r requirements/_test.in
-pytest==5.4.2             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
+pytest==5.4.3             # via -r requirements/_test.in, pytest-aiohttp, pytest-cov, pytest-instafail, pytest-mock, pytest-sugar
 pyyaml==5.3.1             # via -r requirements/_base.txt, trafaret-config
 requests==2.23.0          # via -r requirements/_test.in, coveralls, docker
 six==1.15.0               # via -r requirements/_base.txt, astroid, docker, packaging, tenacity, websocket-client

scripts/requirements.Makefile

@@ -3,7 +3,7 @@
 # SEE docs/python-dependencies.md
 #
 
-.PHONY: reqs check clean help
+.PHONY: touch reqs check clean help
 .DEFAULT_GOAL := help
 
 UPGRADE_OPTION := $(if $(upgrade),--upgrade-package $(upgrade),--upgrade)
@@ -14,6 +14,9 @@ outputs := $(objects:.in=.txt)
 
 reqs: $(outputs) ## pip-compiles all requirements/*.in -> requirements/*.txt; make reqs upgrade=foo will only upgrade package foo
 
+touch:
+	@$(foreach p,${objects},touch ${p};)
+
 # NOTE: runs above requirememts/ such that comments sync with dependabot's
 %.txt: %.in
 	cd ..; \

scripts/requirements/Makefile

@@ -9,7 +9,8 @@
 #   make packages upgrade=name-of-package
 #
 #
-# WARNING: USE CAREFULLY. STILL UNDER DEVELOPMENT
+# WARNING: this batch MUST ONLY be used for non-services. Services are INDEPENDENT
+#          and to upgrade them, use services/{servicesname}/requirements/Makefile
 #
 .DEFAULT_GOAL := help
 

services/api-gateway/requirements/_base.txt

@@ -2,13 +2,13 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --build-isolation --output-file=_base.txt _base.in
+#    pip-compile --output-file=requirements/_base.txt requirements/_base.in
 #
 aiofiles==0.4.0           # via fastapi
-aiopg[sa]==1.0.0          # via -r _base.in
+aiopg[sa]==1.0.0          # via -r requirements/_base.in
 aniso8601==7.0.0          # via graphene
-async-exit-stack==1.0.1   # via -r _base.in, fastapi
-async-generator==1.10     # via -r _base.in, fastapi
+async-exit-stack==1.0.1   # via -r requirements/_base.in, fastapi
+async-generator==1.10     # via -r requirements/_base.in, fastapi
 bcrypt==3.1.7             # via passlib
 certifi==2019.11.28       # via requests
 cffi==1.14.0              # via bcrypt
@@ -17,7 +17,7 @@ click==7.1.1              # via uvicorn
 dataclasses==0.7          # via pydantic
 dnspython==1.16.0         # via email-validator
 email-validator==1.0.5    # via fastapi
-fastapi[all]==0.52.0      # via -r _base.in
+fastapi[all]==0.52.0      # via -r requirements/_base.in
 graphene==2.1.8           # via fastapi
 graphql-core==2.3.1       # via graphene, graphql-relay
 graphql-relay==2.0.1      # via graphene
@@ -27,20 +27,20 @@ idna==2.9                 # via email-validator, requests
 itsdangerous==1.1.0       # via fastapi
 jinja2==2.11.1            # via fastapi
 markupsafe==1.1.1         # via jinja2
-passlib[bcrypt]==1.7.2    # via -r _base.in
+passlib[bcrypt]==1.7.2    # via -r requirements/_base.in
 promise==2.3              # via graphql-core, graphql-relay
 psycopg2-binary==2.8.4    # via aiopg, sqlalchemy
 pycparser==2.20           # via cffi
 pydantic==1.4             # via fastapi
-pyjwt==1.7.1              # via -r _base.in
+pyjwt==1.7.1              # via -r requirements/_base.in
 python-multipart==0.0.5   # via fastapi
 pyyaml==5.3               # via fastapi
 requests==2.23.0          # via fastapi
 rx==1.6.1                 # via graphql-core
 six==1.14.0               # via bcrypt, graphene, graphql-core, graphql-relay, python-multipart, tenacity
 sqlalchemy[postgresql_psycopg2binary]==1.3.15  # via aiopg
 starlette==0.13.2         # via fastapi
-tenacity==6.1.0           # via -r _base.in
+tenacity==6.1.0           # via -r requirements/_base.in
 ujson==2.0.2              # via fastapi
 urllib3==1.25.8           # via requests
 uvicorn==0.11.3           # via fastapi