Merge remote-tracking branch 'upstream/master' into adding-nodeports

Author: Andrei Neagu

packages/models-library/requirements/_test.txt

@@ -9,6 +9,8 @@ aiohttp==3.7.4.post0
     #   -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../requirements/constraints.txt
     #   pytest-aiohttp
+alembic==1.7.4
+    # via -r requirements/../../../packages/postgres-database/requirements/_base.in
 astroid==2.8.0
     # via pylint
 async-timeout==3.0.1
@@ -42,12 +44,23 @@ idna==2.10
     #   -r requirements/../../../packages/postgres-database/requirements/_base.in
     #   requests
     #   yarl
+importlib-metadata==4.8.1
+    # via alembic
+importlib-resources==5.3.0 ; python_version < "3.9"
+    # via
+    #   -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
+    #   -c requirements/../../../requirements/constraints.txt
+    #   alembic
 iniconfig==1.1.1
     # via pytest
 isort==5.9.3
     # via pylint
 lazy-object-proxy==1.6.0
     # via astroid
+mako==1.1.5
+    # via alembic
+markupsafe==2.0.1
+    # via mako
 mccabe==0.6.1
     # via pylint
 multidict==5.1.0
@@ -114,6 +127,7 @@ sqlalchemy==1.3.24
     #   -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/../../../packages/postgres-database/requirements/_base.in
+    #   alembic
 termcolor==1.1.0
     # via pytest-sugar
 text-unidecode==1.3
@@ -140,6 +154,10 @@ yarl==1.6.3
     # via
     #   -r requirements/../../../packages/postgres-database/requirements/_base.in
     #   aiohttp
+zipp==3.6.0
+    # via
+    #   importlib-metadata
+    #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

packages/postgres-database/requirements/_base.in

@@ -6,9 +6,11 @@
 # sqlalchemy[postgresql_psycopg2binary]<1.4,>=1.1 (from aiopg[sa]==1.2.1->-r requirements/_test.in (line 14))
 sqlalchemy[postgresql_psycopg2binary]<1.4,>=1.1
 
-yarl
-
 # There are incompatible versions in the resolved dependencies:
 #   idna==3.1 (from -c requirements/_base.txt (line 9))
 #   idna<3,>=2.5 (from requests==2.25.1->docker==5.0.0->-r requirements/_migration.in (line 16))
 idna<3,>=2.5
+
+
+alembic
+yarl

packages/postgres-database/requirements/_base.txt

@@ -4,10 +4,22 @@
 #
 #    pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in
 #
+alembic==1.7.4
+    # via -r requirements/_base.in
 idna==2.10
     # via
     #   -r requirements/_base.in
     #   yarl
+importlib-metadata==4.8.1
+    # via alembic
+importlib-resources==5.3.0 ; python_version < "3.9"
+    # via
+    #   -c requirements/../../../requirements/constraints.txt
+    #   alembic
+mako==1.1.5
+    # via alembic
+markupsafe==2.0.1
+    # via mako
 multidict==5.1.0
     # via yarl
 psycopg2-binary==2.9.1
@@ -16,5 +28,10 @@ sqlalchemy==1.3.24
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/_base.in
+    #   alembic
 yarl==1.6.3
     # via -r requirements/_base.in
+zipp==3.6.0
+    # via
+    #   importlib-metadata
+    #   importlib-resources

packages/postgres-database/requirements/_migration.txt

@@ -4,8 +4,10 @@
 #
 #    pip-compile --output-file=requirements/_migration.txt --strip-extras requirements/_migration.in
 #
-alembic==1.7.3
-    # via -r requirements/_migration.in
+alembic==1.7.4
+    # via
+    #   -c requirements/_base.txt
+    #   -r requirements/_migration.in
 certifi==2021.5.30
     # via requests
 charset-normalizer==2.0.6
@@ -18,14 +20,23 @@ idna==2.10
     # via
     #   -c requirements/_base.txt
     #   requests
-importlib-resources==5.2.2 ; python_version < "3.9"
+importlib-metadata==4.8.1
+    # via
+    #   -c requirements/_base.txt
+    #   alembic
+importlib-resources==5.3.0 ; python_version < "3.9"
     # via
     #   -c requirements/../../../requirements/constraints.txt
+    #   -c requirements/_base.txt
     #   alembic
 mako==1.1.5
-    # via alembic
+    # via
+    #   -c requirements/_base.txt
+    #   alembic
 markupsafe==2.0.1
-    # via mako
+    # via
+    #   -c requirements/_base.txt
+    #   mako
 psycopg2-binary==2.9.1
     # via
     #   -c requirements/_base.txt
@@ -50,5 +61,8 @@ websocket-client==0.59.0
     # via
     #   -r requirements/_migration.in
     #   docker
-zipp==3.5.0
-    # via importlib-resources
+zipp==3.6.0
+    # via
+    #   -c requirements/_base.txt
+    #   importlib-metadata
+    #   importlib-resources