Maintenance upgrades tests and tools libraries (ITISFoundation#5346)

Author: pcrespov

api/tests/Makefile

@@ -10,6 +10,7 @@ all: install test-dev
 requirements.txt: requirements.in
 	# pip compiling $<
 	uv pip compile $(UPGRADE_OPTION) \
+		--no-header \
 		--output-file $@ $<
 reqs: requirements.txt ## alias to compile requirements.txt
 

api/tests/requirements.in

@@ -5,7 +5,7 @@ aiohttp
 coverage
 openapi-core
 pytest
-pytest-aiohttp
+pytest-asyncio
 pytest-cov
 pytest-instafail
 pytest-sugar

api/tests/requirements.txt

@@ -1,18 +1,6 @@
-#
-# This file is autogenerated by pip-compile with Python 3.10
-# by the following command:
-#
-#    pip-compile --output-file=requirements.txt --strip-extras requirements.in
-#
 aiohttp==3.8.6
-    # via
-    #   -c ../../requirements/constraints.txt
-    #   -r requirements.in
-    #   pytest-aiohttp
 aiosignal==1.3.1
     # via aiohttp
-asgiref==3.7.2
-    # via openapi-core
 async-timeout==4.0.3
     # via aiohttp
 attrs==23.1.0
@@ -21,17 +9,13 @@ attrs==23.1.0
     #   jsonschema
     #   referencing
 certifi==2023.7.22
-    # via
-    #   -c ../../requirements/constraints.txt
-    #   requests
+    # via requests
 charset-normalizer==3.3.2
     # via
     #   aiohttp
     #   requests
 coverage==7.3.2
-    # via
-    #   -r requirements.in
-    #   pytest-cov
+    # via pytest-cov
 exceptiongroup==1.1.3
     # via pytest
 frozenlist==1.4.0
@@ -51,7 +35,7 @@ jsonschema==4.19.2
     #   openapi-core
     #   openapi-schema-validator
     #   openapi-spec-validator
-jsonschema-spec==0.2.4
+jsonschema-path==0.3.2
     # via
     #   openapi-core
     #   openapi-spec-validator
@@ -69,13 +53,12 @@ multidict==6.0.4
     # via
     #   aiohttp
     #   yarl
-openapi-core==0.18.1
-    # via -r requirements.in
+openapi-core==0.19.0
 openapi-schema-validator==0.6.2
     # via
     #   openapi-core
     #   openapi-spec-validator
-openapi-spec-validator==0.6.0
+openapi-spec-validator==0.7.1
     # via openapi-core
 packaging==23.2
     # via
@@ -84,38 +67,28 @@ packaging==23.2
 parse==1.19.1
     # via openapi-core
 pathable==0.4.3
-    # via jsonschema-spec
+    # via jsonschema-path
 pluggy==1.3.0
     # via pytest
 pytest==7.4.3
     # via
-    #   -r requirements.in
-    #   pytest-aiohttp
     #   pytest-asyncio
     #   pytest-cov
     #   pytest-instafail
     #   pytest-sugar
-pytest-aiohttp==1.0.5
-    # via -r requirements.in
 pytest-asyncio==0.21.1
-    # via pytest-aiohttp
 pytest-cov==4.1.0
-    # via -r requirements.in
 pytest-instafail==0.5.0
-    # via -r requirements.in
 pytest-sugar==0.9.7
-    # via -r requirements.in
 pyyaml==6.0.1
-    # via
-    #   -c ../../requirements/constraints.txt
-    #   jsonschema-spec
+    # via jsonschema-path
 referencing==0.30.2
     # via
     #   jsonschema
-    #   jsonschema-spec
+    #   jsonschema-path
     #   jsonschema-specifications
 requests==2.31.0
-    # via jsonschema-spec
+    # via jsonschema-path
 rfc3339-validator==0.1.4
     # via openapi-schema-validator
 rpds-py==0.10.6
@@ -132,12 +105,8 @@ tomli==2.0.1
     # via
     #   coverage
     #   pytest
-typing-extensions==4.8.0
-    # via asgiref
 urllib3==2.0.7
-    # via
-    #   -c ../../requirements/constraints.txt
-    #   requests
+    # via requests
 werkzeug==3.0.1
     # via openapi-core
 yarl==1.9.2

api/tests/test_full_openapis.py

@@ -1,8 +1,8 @@
 from pathlib import Path
 
 import pytest
-from openapi_spec_validator import validate_spec
 from openapi_spec_validator.exceptions import OpenAPISpecValidatorError
+from openapi_spec_validator.shortcuts import get_validator_cls
 from utils import is_openapi_schema, list_files_in_api_specs, load_specs
 
 # NOTE: parametrizing tests per file makes more visible which file failed
@@ -12,12 +12,14 @@
 @pytest.mark.parametrize(
     "spec_file_path",
     list_files_in_api_specs("*.json") + list_files_in_api_specs("*.y*ml"),
-    ids=lambda o: o.name,
+    ids=lambda o: f"{o.parent.name}/{o.name}",
 )
 def test_valid_openapi_specs(spec_file_path: Path):
     specs = load_specs(spec_file_path)
     if is_openapi_schema(specs):
         try:
-            validate_spec(specs, spec_url=spec_file_path.as_uri())
+            openapi_validator_cls = get_validator_cls(specs)
+            openapi_validator_cls(specs)
+
         except OpenAPISpecValidatorError as err:
             pytest.fail(f"Failed validating {spec_file_path}:\n{err.message}")

packages/aws-library/requirements/_base.txt

@@ -1,33 +1,13 @@
-#
-# This file is autogenerated by pip-compile with Python 3.10
-# by the following command:
-#
-#    pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in
-#
 aio-pika==9.3.0
-    # via -r requirements/../../../packages/service-library/requirements/_base.in
 aioboto3==12.0.0
-    # via -r requirements/_base.in
 aiobotocore==2.7.0
-    # via
-    #   aioboto3
-    #   aiobotocore
+    # via aioboto3
 aiocache==0.12.2
-    # via -r requirements/_base.in
 aiodebug==2.3.0
-    # via -r requirements/../../../packages/service-library/requirements/_base.in
 aiodocker==0.21.0
-    # via -r requirements/../../../packages/service-library/requirements/_base.in
 aiofiles==23.2.1
-    # via -r requirements/../../../packages/service-library/requirements/_base.in
 aiohttp==3.8.6
     # via
-    #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../requirements/constraints.txt
     #   aiobotocore
     #   aiodocker
 aioitertools==0.11.0
@@ -37,10 +17,6 @@ aiormq==6.7.7
 aiosignal==1.3.1
     # via aiohttp
 arrow==1.3.0
-    # via
-    #   -r requirements/../../../packages/models-library/requirements/_base.in
-    #   -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
-    #   -r requirements/../../../packages/service-library/requirements/_base.in
 async-timeout==4.0.3
     # via
     #   aiohttp
@@ -80,9 +56,6 @@ jmespath==1.0.1
     #   boto3
     #   botocore
 jsonschema==4.19.2
-    # via
-    #   -r requirements/../../../packages/models-library/requirements/_base.in
-    #   -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
 jsonschema-specifications==2023.7.1
     # via jsonschema
 markdown-it-py==3.0.0
@@ -94,82 +67,37 @@ multidict==6.0.4
     #   aiohttp
     #   yarl
 orjson==3.9.10
-    # via
-    #   -r requirements/../../../packages/models-library/requirements/_base.in
-    #   -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
 pamqp==3.2.1
     # via aiormq
 pydantic==1.10.13
-    # via
-    #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../requirements/constraints.txt
-    #   -r requirements/../../../packages/models-library/requirements/_base.in
-    #   -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
-    #   -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
-    #   -r requirements/../../../packages/service-library/requirements/_base.in
-    #   -r requirements/../../../packages/settings-library/requirements/_base.in
-    #   -r requirements/_base.in
 pygments==2.16.1
     # via rich
 pyinstrument==4.6.1
-    # via -r requirements/../../../packages/service-library/requirements/_base.in
 python-dateutil==2.8.2
     # via
     #   arrow
     #   botocore
 pyyaml==6.0.1
-    # via
-    #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../requirements/constraints.txt
-    #   -r requirements/../../../packages/service-library/requirements/_base.in
 redis==5.0.1
-    # via
-    #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../requirements/constraints.txt
-    #   -r requirements/../../../packages/service-library/requirements/_base.in
 referencing==0.29.3
     # via
-    #   -c requirements/../../../packages/service-library/requirements/./constraints.txt
     #   jsonschema
     #   jsonschema-specifications
 rich==13.6.0
-    # via
-    #   -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
-    #   -r requirements/../../../packages/settings-library/requirements/_base.in
 rpds-py==0.12.0
     # via
     #   jsonschema
     #   referencing
 s3transfer==0.7.0
     # via boto3
 sh==2.0.6
-    # via -r requirements/_base.in
 six==1.16.0
     # via python-dateutil
 tenacity==8.2.3
-    # via -r requirements/../../../packages/service-library/requirements/_base.in
 toolz==0.12.0
-    # via -r requirements/../../../packages/service-library/requirements/_base.in
 tqdm==4.66.1
-    # via -r requirements/../../../packages/service-library/requirements/_base.in
 typer==0.9.0
-    # via
-    #   -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
-    #   -r requirements/../../../packages/settings-library/requirements/_base.in
 types-aiobotocore==2.7.0
-    # via -r requirements/_base.in
 types-aiobotocore-ec2==2.7.0
     # via types-aiobotocore
 types-aiobotocore-s3==2.7.0
@@ -188,14 +116,7 @@ typing-extensions==4.8.0
     #   types-aiobotocore-ec2
     #   types-aiobotocore-s3
 urllib3==2.0.7
-    # via
-    #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
-    #   -c requirements/../../../requirements/constraints.txt
-    #   botocore
+    # via botocore
 wrapt==1.16.0
     # via aiobotocore
 yarl==1.9.2

packages/aws-library/requirements/_test.in

@@ -14,7 +14,7 @@ faker
 moto[server]
 pint
 pytest
-pytest-aiohttp  # incompatible with pytest-asyncio. See https://github.com/pytest-dev/pytest-asyncio/issues/76
+pytest-asyncio
 pytest-cov
 pytest-icdiff
 pytest-instafail