🏗️ maintenance week-9: upgrades test&tool requirements (#2191)

* upgrade TEST dependencies on packages * system tests upgrade * api-server test&tools reqs upgrade * catalog tests&tools reqs upgrade * director-v2 tests&tools reqs upgrade * sidecar tests&tools reqs upgrade * storage test&tools reqs upgrade * web-server test&tools reqs upgrades * Fixes backward comp with pydantic * constr is a function that produced constraint string types but not a type itself * PortsMapping->BasePortsMapping since must be used as BASE class
ITISFoundation · Mar 19, 2021 · ab36b42 · ab36b42
1 parent be84893
commit ab36b42
Show file tree

Hide file tree

Showing 46 changed files with 331 additions and 286 deletions.
diff --git a/api/tests/requirements.txt b/api/tests/requirements.txt
@@ -4,7 +4,7 @@
 #
 #    pip-compile --output-file=requirements.txt requirements.in
 #
-aiohttp==3.7.3
+aiohttp==3.7.4
     # via
     #   -r requirements.in
     #   pytest-aiohttp
@@ -18,7 +18,7 @@ attrs==20.3.0
     #   pytest
 chardet==3.0.4
     # via aiohttp
-coverage==5.4
+coverage==5.5
     # via
     #   -r requirements.in
     #   pytest-cov
@@ -29,7 +29,7 @@ idna==2.10
     #   -c ../../requirements/constraints.txt
     #   idna-ssl
     #   yarl
-importlib-metadata==3.4.0
+importlib-metadata==3.7.0
     # via
     #   jsonschema
     #   pluggy
@@ -52,11 +52,13 @@ multidict==5.1.0
     # via
     #   aiohttp
     #   yarl
-openapi-core==0.13.6
+openapi-core==0.13.7
     # via -r requirements.in
-openapi-schema-validator==0.1.1
-    # via openapi-core
-openapi-spec-validator==0.2.9
+openapi-schema-validator==0.1.4
+    # via
+    #   openapi-core
+    #   openapi-spec-validator
+openapi-spec-validator==0.3.0
     # via openapi-core
 packaging==20.9
     # via
@@ -98,8 +100,6 @@ six==1.15.0
     #   openapi-core
     #   openapi-schema-validator
     #   openapi-spec-validator
-strict-rfc3339==0.7
-    # via openapi-schema-validator
 termcolor==1.1.0
     # via pytest-sugar
 toml==0.10.2

diff --git a/packages/models-library/requirements/_base.txt b/packages/models-library/requirements/_base.txt
@@ -14,5 +14,7 @@ idna==2.10
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   email-validator
-pydantic[email]==1.7.3
+pydantic[email]==1.8.1
     # via -r requirements/_base.in
+typing-extensions==3.7.4.3
+    # via pydantic
diff --git a/packages/models-library/requirements/_test.txt b/packages/models-library/requirements/_test.txt
@@ -4,9 +4,9 @@
 #
 #    pip-compile --output-file=requirements/_test.txt requirements/_test.in
 #
-aiohttp==3.7.3
+aiohttp==3.7.4
     # via pytest-aiohttp
-astroid==2.4.2
+astroid==2.5.1
     # via pylint
 async-timeout==3.0.1
     # via aiohttp
@@ -20,12 +20,12 @@ chardet==3.0.4
     # via
     #   aiohttp
     #   requests
-coverage==5.4
+coverage==5.5
     # via
     #   -r requirements/_test.in
     #   coveralls
     #   pytest-cov
-coveralls==3.0.0
+coveralls==3.0.1
     # via -r requirements/_test.in
 docopt==0.6.2
     # via coveralls
@@ -40,18 +40,18 @@ idna==2.10
     #   idna-ssl
     #   requests
     #   yarl
-importlib-metadata==3.4.0
+importlib-metadata==3.7.0
     # via
     #   pint
     #   pluggy
     #   pytest
-importlib-resources==5.1.0
+importlib-resources==5.1.1
     # via pint
 iniconfig==1.1.1
     # via pytest
 isort==5.7.0
     # via pylint
-lazy-object-proxy==1.4.3
+lazy-object-proxy==1.5.2
     # via astroid
 mccabe==0.6.1
     # via pylint
@@ -72,7 +72,7 @@ pprintpp==0.4.0
     # via pytest-icdiff
 py==1.10.0
     # via pytest
-pylint==2.6.0
+pylint==2.7.2
     # via -r requirements/_test.in
 pyparsing==2.4.7
     # via packaging
@@ -105,8 +105,6 @@ pyyaml==5.4.1
     #   -r requirements/_test.in
 requests==2.25.1
     # via coveralls
-six==1.15.0
-    # via astroid
 termcolor==1.1.0
     # via pytest-sugar
 toml==0.10.2
@@ -117,6 +115,7 @@ typed-ast==1.4.2
     # via astroid
 typing-extensions==3.7.4.3
     # via
+    #   -c requirements/_base.txt
     #   aiohttp
     #   importlib-metadata
     #   yarl

diff --git a/packages/models-library/requirements/_tools.txt b/packages/models-library/requirements/_tools.txt
@@ -26,14 +26,14 @@ distlib==0.3.1
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
-identify==1.5.13
+identify==2.1.0
     # via pre-commit
-importlib-metadata==3.4.0
+importlib-metadata==3.7.0
     # via
     #   -c requirements/_test.txt
     #   pre-commit
     #   virtualenv
-importlib-resources==5.1.0
+importlib-resources==5.1.1
     # via
     #   -c requirements/_test.txt
     #   pre-commit
@@ -60,9 +60,7 @@ pyyaml==5.4.1
 regex==2020.11.13
     # via black
 six==1.15.0
-    # via
-    #   -c requirements/_test.txt
-    #   virtualenv
+    # via virtualenv
 toml==0.10.2
     # via
     #   -c requirements/_test.txt
@@ -74,6 +72,7 @@ typed-ast==1.4.2
     #   black
 typing-extensions==3.7.4.3
     # via
+    #   -c requirements/_base.txt
     #   -c requirements/_test.txt
     #   black
     #   importlib-metadata

diff --git a/packages/models-library/src/models_library/services.py b/packages/models-library/src/models_library/services.py
@@ -180,11 +180,6 @@ class ServiceProperty(BaseModel):
         None, description="Units, when it refers to a physical quantity"
     )
 
-    # TODO: use discriminators
-    unit: Optional[str] = Field(
-        None, description="Units, when it refers to a physical quantity"
-    )
-
     class Config:
         extra = Extra.forbid
         # TODO: all alias with camecase

diff --git a/packages/postgres-database/requirements/_migration.txt b/packages/postgres-database/requirements/_migration.txt
@@ -4,7 +4,7 @@
 #
 #    pip-compile --output-file=requirements/_migration.txt requirements/_migration.in
 #
-alembic==1.5.4
+alembic==1.5.5
     # via -r requirements/_migration.in
 certifi==2020.12.5
     # via requests
@@ -14,7 +14,7 @@ chardet==3.0.4
     #   requests
 click==7.1.2
     # via -r requirements/_migration.in
-docker==4.4.1
+docker==4.4.4
     # via -r requirements/_migration.in
 idna==2.10
     # via
@@ -46,12 +46,12 @@ sqlalchemy[postgresql_psycopg2binary]==1.3.23
     #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_base.txt
     #   alembic
-tenacity==6.3.1
+tenacity==7.0.0
     # via -r requirements/_migration.in
 urllib3==1.26.3
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/_migration.in
     #   requests
-websocket-client==0.57.0
+websocket-client==0.58.0
     # via docker
diff --git a/packages/postgres-database/requirements/_test.txt b/packages/postgres-database/requirements/_test.txt
@@ -4,11 +4,11 @@
 #
 #    pip-compile --output-file=requirements/_test.txt requirements/_test.in
 #
-aiohttp==3.7.3
+aiohttp==3.7.4
     # via pytest-aiohttp
 aiopg[sa]==1.1.0
     # via -r requirements/_test.in
-astroid==2.4.2
+astroid==2.5.1
     # via pylint
 async-timeout==3.0.1
     # via aiohttp
@@ -36,14 +36,14 @@ chardet==3.0.4
     #   -c requirements/_migration.txt
     #   aiohttp
     #   requests
-coverage==5.4
+coverage==5.5
     # via
     #   -r requirements/_test.in
     #   coveralls
     #   pytest-cov
-coveralls==3.0.0
+coveralls==3.0.1
     # via -r requirements/_test.in
-cryptography==3.4.5
+cryptography==3.4.6
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   paramiko
@@ -53,7 +53,7 @@ docker-compose==1.27.4
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   pytest-docker
-docker[ssh]==4.4.1
+docker[ssh]==4.4.4
     # via
     #   -c requirements/_migration.txt
     #   docker-compose
@@ -63,7 +63,7 @@ docopt==0.6.2
     # via
     #   coveralls
     #   docker-compose
-faker==6.1.1
+faker==6.5.0
     # via -r requirements/_test.in
 idna-ssl==1.1.0
     # via aiohttp
@@ -75,7 +75,7 @@ idna==2.10
     #   idna-ssl
     #   requests
     #   yarl
-importlib-metadata==3.4.0
+importlib-metadata==3.7.0
     # via
     #   jsonschema
     #   pluggy
@@ -86,7 +86,7 @@ isort==5.7.0
     # via pylint
 jsonschema==3.2.0
     # via docker-compose
-lazy-object-proxy==1.4.3
+lazy-object-proxy==1.5.2
     # via astroid
 mccabe==0.6.1
     # via pylint
@@ -111,7 +111,7 @@ py==1.10.0
     # via pytest
 pycparser==2.20
     # via cffi
-pylint==2.6.0
+pylint==2.7.2
     # via -r requirements/_test.in
 pynacl==1.4.0
     # via paramiko
@@ -156,7 +156,6 @@ requests==2.25.1
 six==1.15.0
     # via
     #   -c requirements/_migration.txt
-    #   astroid
     #   bcrypt
     #   docker
     #   dockerpty
@@ -191,7 +190,7 @@ urllib3==1.26.3
     #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_migration.txt
     #   requests
-websocket-client==0.57.0
+websocket-client==0.58.0
     # via
     #   -c requirements/_migration.txt
     #   docker

diff --git a/packages/postgres-database/requirements/_tools.txt b/packages/postgres-database/requirements/_tools.txt
@@ -24,14 +24,14 @@ distlib==0.3.1
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
-identify==1.5.13
+identify==2.1.0
     # via pre-commit
-importlib-metadata==3.4.0
+importlib-metadata==3.7.0
     # via
     #   -c requirements/_test.txt
     #   pre-commit
     #   virtualenv
-importlib-resources==5.1.0
+importlib-resources==5.1.1
     # via
     #   pre-commit
     #   virtualenv